Revision 5781

View differences:

trunk/extensions/extGeoreferencing/text.properties
1 1
#text.properties
2 2
accept_tip=Procesa los GCP's y salva la georreferenciaci?n. Da por terminada la introducci?n de GCP's.
3
aceptar=Aceptar
3 4
activo=Activo
4 5
algoritmo=Algoritmo
5 6
ampl_extent=Variar la extensi?n de la imagen a georreferenciar
......
20 21
confirmacion=Confirmaci?n
21 22
crear_worldfile=Crear fichero de georreferenciaci?n (worldfile)
22 23
cuadro_no_asociado=El cuadro de georreferenciaci?n no est? asociado a ninguna capa sobre la vista, este se cerrar?. Por favor, abra el dialogo asociado a la capa que necesite.
24
de=de
23 25
desactivar_capa=Oculta la capa despues del primer punto.
24 26
desactivar_puntos=Desactiva capa de puntos despues del primer punto.
25 27
eliminar_punto=Eliminar punto
28
eliminar_todos_puntos=Eliminar todos los puntos
26 29
error=Error
27 30
errores_csv=Incluir los errores en fichero CSV.
28 31
error_capa_puntos=Error al cargar la capa. Puede que la capa de Georreferenciaci?n no est? activa.
32
escala=Escala
29 33
exportar_ascii=Exportar ASCII
30 34
file_exists=El fichero existe. ?Desea sobreescribirlo?
31 35
fuera_de_extent=El punto seleccionado est? fuera del extent de la imagen
36
georaster=Georreferenciaci?n
32 37
georef=Georreferenciar
33 38
georef_file=Fichero de georreferenciaci?n
34 39
gcps_exist=La capa ya tiene un fichero .rmf. Si este ya contiene GCP's ser?n sobreescritos.\n ?Desea continuar?
......
42 47
no=No
43 48
nuevo=Nuevo
44 49
options=Opciones
50
plegar=Plegar/Desplegar
45 51
plegar_despl=Plegar/Desplegar
46 52
punto=Punto
53
puntos=Puntos
47 54
primero=Primero
48 55
procesar=Procesar
49 56
process_tip=Procesa los GCP's y asigna un extent temporal a la imagen.
......
55 62
Move_from_view=Mover puntos desde la vista
56 63
selectfromview=Activa/Desactiva la herramienta de selecci?n desde la vista.
57 64
siguiente=Siguiente
65
table=Tabla
58 66
total=Total
59 67
ultimo=?ltimo
60 68
yes=Si
61 69
zoom=Zoom
62 70
Zoom_previo=Extensi?n anterior
63 71
Zoom_sgte=Extensi?n siguiente
64
georreferenciar=Georreferenciar
65
aceptar=Aceptar
66
escala=Escala
67
table=Tabla
68
plegar=Plegar/Desplegar
69
puntos=Puntos
70
de=de
71
georaster=Georreferenciaci?n
72
eliminar_todos_puntos=Eliminar todos los puntos
72
georreferenciar=Georreferenciar
trunk/extensions/extGeoreferencing/.project
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<projectDescription>
3
	<name>gvSIG Georeferencing</name>
3
	<name>extGeoreferencing</name>
4 4
	<comment></comment>
5 5
	<projects>
6 6
	</projects>
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/utils/PointManager.java
18 18
import org.gvsig.georeferencing.gui.panels.AdjustGeorefPanel;
19 19
import org.gvsig.georeferencing.gui.panels.OptionsPanel;
20 20
import org.gvsig.georeferencing.gui.panels.ZoomControlPanel;
21
import org.gvsig.georeferencing.gui.pointsTable.ButtonsExportImportPanel;
21
import org.gvsig.georeferencing.gui.pointsTable.TablePanelButtons;
22 22
import org.gvsig.georeferencing.gui.pointsTable.TableControlerPanel;
23 23
import org.gvsig.georeferencing.gui.pointsTable.TablePointsPanel;
24 24
import org.gvsig.georeferencing.gui.pointsTable.TablePointsPanel.PointTable;
......
55 55
	
56 56
	private TablePointsPanel 			tablePointsPanel = null;
57 57
	private TableControlerPanel 		tableControlerPanel2 = null;
58
	private ButtonsExportImportPanel	buttonsExportImportPanel = null;
58
	private TablePanelButtons	buttonsExportImportPanel = null;
59 59
	
60 60
	private OptionsPanel				optionsPanel = null;
61 61
	private ZoomControlPanel			zoomControlPanelLeft = null;
......
81 81
		this.tableControlerPanel1 = dialog.getSelectPointsPanel().getTableControlerPanel();
82 82
		this.tablePointsPanel = dialog.getConectorPanel().getDataPointsTabPanel().getTablePointsPanel();
83 83
		this.tableControlerPanel2 = dialog.getConectorPanel().getDataPointsTabPanel().getTablePointsPanel().getTableControlerPanel();
84
		this.buttonsExportImportPanel = dialog.getConectorPanel().getDataPointsTabPanel().getTablePointsPanel().getPButtonsExportImportPanel();
84
		this.buttonsExportImportPanel = dialog.getConectorPanel().getDataPointsTabPanel().getTablePointsPanel().getPTablePanelButtons();
85 85
		this.optionsPanel = dialog.getConectorPanel().getAdjustGeorefPanel().getOptionsPanel();
86 86
		this.zoomControlPanelLeft = dialog.getConectorPanel().getAdjustGeorefPanel().getZoomLeft();
87 87
		this.zoomControlPanelRight = dialog.getConectorPanel().getAdjustGeorefPanel().getZoomRight();
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/gui/selectPoints/SelectPointsPanel.java
45 45
	private TableControlerPanel 	tableControlerPanel = null;
46 46
	private DataPointPanel 			dataPointPanel = null;
47 47
	private ErrorPointPanel 		errorPointPanel = null;
48
	private GeoreferencingDialog	grd = null;
48
	private GeoreferencingDialog	dialog = null;
49 49
	private boolean 				update = false;
50 50
	/**
51 51
	 * Valores ?ltimos que se han introducido en los JTextField para poder reponerlos.
......
73 73
	public SelectPointsPanel(GeoreferencingDialog grd) {
74 74
		super();
75 75
		initialize();
76
		this.grd = grd;
76
		this.dialog = grd;
77 77
	}
78 78
	
79 79
	/**
......
110 110
			
111 111
		}
112 112
		tableControlerPanel.checkArrows();
113
		lyrPoints.getPointManager().selectPoint(pointSelected, this.grd);
113
		lyrPoints.getPointManager().selectPoint(pointSelected, this.dialog);
114 114
		//disableEvent = false;
115 115
	}
116 116
	
......
167 167
        		lastIndexSelection = pos;
168 168
        		tableControlerPanel.setSelectedIndex(pos);
169 169
        	}
170
        	lyrPoints.getPointManager().selectPoint(tableControlerPanel.getSelectedIndex(), this.grd);
170
        	lyrPoints.getPointManager().selectPoint(tableControlerPanel.getSelectedIndex(), dialog);
171 171
        	tableControlerPanel.checkArrows();
172 172
    	}catch(NoSuchFieldException exc){
173 173
    		JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(),
......
184 184
	 */
185 185
	private void loadLyrPoint() throws InstantiationException{
186 186
		if(lyrPoints == null){
187
			lyrPoints = this.grd.getLyrPoints();
187
			lyrPoints = dialog.getLyrPoints();
188 188
			if(lyrPoints == null)
189 189
				throw new InstantiationException();
190 190
		}
......
208 208
			bInsertPoint.setEnabled(false);
209 209
			bInsertPoint.setSelected(true);
210 210
			bInsertPoint.setToolTipText(PluginServices.getText(this, "selectfromview"));
211
			bInsertPoint.addActionListener(new java.awt.event.ActionListener() { 
212
				public void actionPerformed(java.awt.event.ActionEvent e) {
213
					View theView = (View) PluginServices.getMDIManager().getActiveView();
214
					if(!bInsertPoint.isSelected()){
215
						String toolSelected = theView.getMapControl().getTool();
216
						if(toolSelected.equals("pointLyrSelection"))
217
							theView.getMapControl().setTool(lyrPoints.getLastTool());
218
						else
219
							theView.getMapControl().setTool("pointLyrSelection");
220
					}else
221
						theView.getMapControl().setTool("pointLyrSelection");
222
				}
223
			});
211
			bInsertPoint.addActionListener(this);
224 212
		}
225 213
		return bInsertPoint;
226 214
	}
......
263 251
				}catch(InstantiationException exc){
264 252
					return;
265 253
				}
266
				lyrPoints.getPointManager().selectPoint(tableControlerPanel.getSelectedIndex(), grd);
254
				lyrPoints.getPointManager().selectPoint(tableControlerPanel.getSelectedIndex(), dialog);
267 255
				tableControlerPanel.checkArrows();
268 256
			}
269 257
		}
270 258
		
259
		//Bot?n de activar/desactivar la inserci?n de un punto
260
		if((e.getSource() == getBInsertPoint()) || (e.getSource() == dialog.getBInsertPointOfTablePoints())){
261
			View theView = (View) PluginServices.getMDIManager().getActiveView();
262
			if(!bInsertPoint.isSelected()){
263
				String toolSelected = theView.getMapControl().getTool();
264
				if(toolSelected.equals("pointLyrSelection"))
265
					theView.getMapControl().setTool(lyrPoints.getLastTool());
266
				else
267
					theView.getMapControl().setTool("pointLyrSelection");
268
			}else
269
				theView.getMapControl().setTool("pointLyrSelection");
270
		}
271
		
271 272
		//Bot?n de nuevo punto
272
		if(e.getSource() == tableControlerPanel.getBNew()){
273
		if((e.getSource() == tableControlerPanel.getBNew()) || (e.getSource() == dialog.getBNewPointOfTablePoints())){
273 274
			//Comprobamos si est? activa la inserci?n de punto o no. Si no est? activa no hacemos nada
274 275
			if(bInsertPoint.isSelected()){
275
				grd.getPointManager().newEmptyPoint();
276
				dialog.getPointManager().newEmptyPoint();
276 277
				
277 278
				//Desactivamos todos los controles para centrar la visi?n del usuario
278 279
				//sobre la introducci?n de puntos
279
				grd.getPointManager().disableAllControls();
280
				dialog.getPointManager().disableAllControls();
280 281
				
281 282
				View theView = null;
282 283
				try{
......
295 296
								null,     
296 297
								options,  
297 298
								string1); 
298
						grd.getFrame().setClosed(true);
299
						dialog.getFrame().setClosed(true);
299 300
						return;
300 301
					}catch(PropertyVetoException exc){}
301 302
				}
......
314 315
			}
315 316
		}
316 317
				
317
		TableControlerPanel ctrlPanel = grd.getConectorPanel().getDataPointsTabPanel().getTablePointsPanel().getTableControlerPanel();
318
		TableControlerPanel ctrlPanel = dialog.getConectorPanel().getDataPointsTabPanel().getTablePointsPanel().getTableControlerPanel();
318 319
		
319 320
		//Bot?n de eliminado de todos los puntos
320 321
		if(	e.getSource() == getTableControlerPanel().getBClear() ||
321 322
			e.getSource() == ctrlPanel.getBClear()){
322
			grd.getPointManager().deleteAllPoints();
323
			dialog.getPointManager().deleteAllPoints();
323 324
		}
324 325
		
325 326
		//Bot?n de eliminado de un punto
326 327
		if(e.getSource() == getTableControlerPanel().getBDelPoint() ||
327 328
				e.getSource() == ctrlPanel.getBDelPoint()){
328
			grd.getPointManager().deletePoint();
329
			dialog.getPointManager().deletePoint();
329 330
		}
330 331
		
331 332
		//Bot?n de extensi?n del cuadro de dialogo
332 333
		if(e.getSource() == this.getBExtended())
333
			this.setEnlarge(grd.isEnlarge());
334
			this.setEnlarge(dialog.isEnlarge());
334 335
		
335 336
	}
336 337

  
......
461 462
		com.iver.cit.gvsig.gui.View theView = null;
462 463
		try{
463 464
			theView = (com.iver.cit.gvsig.gui.View)PluginServices.getMDIManager().getActiveView();
464
			theView.getMapControl().setTool(grd.getLyrPoints().getLastTool());
465
			theView.getMapControl().setTool(dialog.getLyrPoints().getLastTool());
465 466
		}catch(ClassCastException exc){
466 467
			//No se selecciona la herramienta
467 468
		}
......
477 478
		double x = 0D;
478 479
		try{
479 480
			x = Double.valueOf(tx).doubleValue();
480
			if(x > grd.getLyrGeoRaster().getImageWidth() || x < 0)
481
			if(x > dialog.getLyrGeoRaster().getImageWidth() || x < 0)
481 482
				throw new NumberFormatException();
482 483
		}catch(NumberFormatException exc){
483 484
			//Si no es valido reponemos lastValue
......
500 501
		double y = 0D;
501 502
		try{
502 503
			y = Double.valueOf(ty).doubleValue();
503
			if(y > grd.getLyrGeoRaster().getImageHeight() || y < 0)
504
			if(y > dialog.getLyrGeoRaster().getImageHeight() || y < 0)
504 505
				throw new NumberFormatException();
505 506
		}catch(NumberFormatException exc){
506 507
			//Si no es valido reponemos lastValue
......
542 543
			else{
543 544
				lastBlockTx = "";
544 545
				//Llamamos a la funci?n que gestiona la entrada del primer punto
545
				grd.getPointManager().selectFirstPoint(tx, ty);
546
				dialog.getPointManager().selectFirstPoint(tx, ty);
546 547
			}
547 548
		}
548 549
	}
......
562 563
			else{
563 564
				lastBlockTy = "";
564 565
				//Llamamos a la funci?n que gestiona la entrada del primer punto
565
				grd.getPointManager().selectFirstPoint(tx, ty);
566
				dialog.getPointManager().selectFirstPoint(tx, ty);
566 567
			}
567 568
		}
568 569
	}
......
583 584
			lastLat = lat;
584 585
			lastBlockLat = "";
585 586
			//Llamamos a la funci?n que gestiona la entrada del segundo punto
586
			grd.getPointManager().selectSecondPoint(lon, lat);
587
			dialog.getPointManager().selectSecondPoint(lon, lat);
587 588
		}
588 589
	}
589 590
	
......
603 604
			lastLong = lon;
604 605
			lastBlockLong = "";
605 606
			//Llamamos a la funci?n que gestiona la entrada del segundo punto
606
			grd.getPointManager().selectSecondPoint(lon, lat);
607
			dialog.getPointManager().selectSecondPoint(lon, lat);
607 608
		}
608 609
	}
609 610
	
......
638 639
			!dataPointPanel.getTY().getText().equals("") &&
639 640
			!dataPointPanel.getLongitud().getText().equals("") && 
640 641
			!dataPointPanel.getLatitud().getText().equals("")){
641
				grd.getPointManager().restoreControlsValue();
642
				dialog.getPointManager().restoreControlsValue();
642 643
				this.abortSelectPoints();	
643 644
		}
644 645
				
......
656 657
	 */
657 658
	public void setEnlarge(boolean enlarge){
658 659
		if(enlarge){
659
			grd.setEnlarge(!enlarge);
660
			dialog.setEnlarge(!enlarge);
660 661
			bExtended.setIcon(new ImageIcon(getClass().getClassLoader().getResource(pathToImages + "down.png")));
661 662
		}else{
662
			grd.setEnlarge(!enlarge);
663
			dialog.setEnlarge(!enlarge);
663 664
			bExtended.setIcon(new ImageIcon(getClass().getClassLoader().getResource(pathToImages + "up.png")));
664 665
			if(lyrPoints != null){
665 666
				//lyrPoints.getPointManager().selectPoint(tableControlerPanel.getSelectedIndex(), this.grd);
666
				if(lyrPoints.isNewPoint(grd.getSelectedPoint())){
667
					grd.getConectorPanel().getAdjustGeorefPanel().getZoomLeft().setEnabled(false);
668
					grd.getConectorPanel().getAdjustGeorefPanel().getZoomRight().setEnabled(false);
667
				if(lyrPoints.isNewPoint(dialog.getSelectedPoint())){
668
					dialog.getConectorPanel().getAdjustGeorefPanel().getZoomLeft().setEnabled(false);
669
					dialog.getConectorPanel().getAdjustGeorefPanel().getZoomRight().setEnabled(false);
669 670
				}
670
				grd.getZoomControlRight().draw();
671
				grd.getZoomControlLeft().draw();
671
				dialog.getZoomControlRight().draw();
672
				dialog.getZoomControlLeft().draw();
672 673
			}
673 674
		}
674 675
	}
......
705 706
	public JButton getBExtended() {
706 707
		if (bExtended == null) {
707 708
			bExtended = new JButton();
708
			bExtended.setPreferredSize(new java.awt.Dimension(42,22));
709
			bExtended.setPreferredSize(new java.awt.Dimension(22,22));
709 710
			bExtended.setIcon(new ImageIcon(getClass().getClassLoader().getResource(pathToImages + "down.png")));
710 711
			bExtended.setToolTipText(PluginServices.getText(this, "plegar_despl"));
711 712
			bExtended.addActionListener(this);
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/gui/dialogs/GeoreferencingDialog.java
43 43
import org.gvsig.georeferencing.utils.StackZoom;
44 44

  
45 45
import com.iver.andami.PluginServices;
46
import com.iver.andami.ui.mdiFrame.JToggleButton;
46 47
import com.iver.cit.gvsig.fmap.DriverException;
47 48
import com.iver.cit.gvsig.fmap.MapControl;
48 49
import com.iver.cit.gvsig.fmap.ViewPort;
49
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
50 50
import com.iver.cit.gvsig.fmap.drivers.RasterDriver;
51 51
import com.iver.cit.gvsig.fmap.layers.FLayers;
52 52
import com.iver.cit.gvsig.fmap.layers.FLyrGeoRaster;
53 53
import com.iver.cit.gvsig.fmap.layers.FLyrPoints;
54 54
import com.iver.cit.gvsig.fmap.layers.FLyrRaster;
55
import com.iver.cit.gvsig.fmap.layers.GeoPoint;
56 55
import com.iver.cit.gvsig.fmap.layers.IGeoUi;
57
import com.iver.cit.gvsig.fmap.layers.RasterAdapter;
58 56
import com.iver.cit.gvsig.fmap.layers.RasterFileAdapter;
59 57
import com.iver.cit.gvsig.fmap.tools.ZoomOutRightButtonListener;
60 58
import com.iver.cit.gvsig.fmap.tools.Behavior.Behavior;
......
280 278
        tablePointsPanel = getConectorPanel().getDataPointsTabPanel().getTablePointsPanel(); 
281 279
        tablePointsPanel.getTableControlerPanel().getBClear().addActionListener(this.getConectorPanel().getDataPointsTabPanel().getSelectPointsPanel());
282 280
        tablePointsPanel.getTableControlerPanel().getBDelPoint().addActionListener(this.getConectorPanel().getDataPointsTabPanel().getSelectPointsPanel());
283
        tablePointsPanel.getPButtonsExportImportPanel().getBLoad().addActionListener(this);
284
        tablePointsPanel.getPButtonsExportImportPanel().getBSave().addActionListener(this);
285
        tablePointsPanel.getPButtonsExportImportPanel().getBExportToAscii().addActionListener(this);
281
        tablePointsPanel.getPTablePanelButtons().getBLoad().addActionListener(this);
282
        tablePointsPanel.getPTablePanelButtons().getBSave().addActionListener(this);
283
        tablePointsPanel.getPTablePanelButtons().getBExportToAscii().addActionListener(this);
286 284
        conectorPanel.getDataPointsTabPanel().getSelectPointsPanel().getDataPointPanel().getCbActive().addActionListener(this);
285
		getBInsertPointOfTablePoints().addActionListener(conectorPanel.getDataPointsTabPanel().getSelectPointsPanel());
286
		getBNewPointOfTablePoints().addActionListener(conectorPanel.getDataPointsTabPanel().getSelectPointsPanel());
287 287
    }
288 288
    		
289 289
	/**
......
356 356
				cancel(theView);
357 357
						
358 358
			//CARGAR PUNTOS
359
			if(e.getSource() == tablePointsPanel.getPButtonsExportImportPanel().getBLoad())
359
			if(e.getSource() == tablePointsPanel.getPTablePanelButtons().getBLoad())
360 360
				loadPoints(theView);
361 361
						
362 362
			//SALVAR PUNTOS
363
			if(e.getSource() == tablePointsPanel.getPButtonsExportImportPanel().getBSave())
363
			if(e.getSource() == tablePointsPanel.getPTablePanelButtons().getBSave())
364 364
				savePoints();				
365 365
			
366 366
			
367 367
			//EXPORTAR A ASCII
368
			if(e.getSource() == tablePointsPanel.getPButtonsExportImportPanel().getBExportToAscii())
368
			if(e.getSource() == tablePointsPanel.getPTablePanelButtons().getBExportToAscii())
369 369
				exportToASCII(theView);	
370 370
						
371 371
			//DESACTIVAR PANELES
......
1256 1256
	public void setOffPoints(boolean offPoints) {
1257 1257
		this.offPoints = offPoints;
1258 1258
	}
1259
	
1260
	/**
1261
	 * Obtiene el bot?n de activar/desactivar la inserci?n de punto del panel del control de
1262
	 * tabla  
1263
	 * @return JToggleButton
1264
	 */
1265
	public JToggleButton getBInsertPointOfTablePoints(){
1266
		return tablePointsPanel.getPTablePanelButtons().getBInsertPoint();
1267
	}
1268
	
1269
	/**
1270
	 * Obtiene el bot?n de activar/desactivar la inserci?n de punto del panel del control de
1271
	 * tabla  
1272
	 * @return JToggleButton
1273
	 */
1274
	public JButton getBNewPointOfTablePoints(){
1275
		return tablePointsPanel.getTableControlerPanel().getBNew();
1276
	}
1259 1277
	//**********************End Setters & Getters*****************
1260 1278
		
1261 1279
 }  //  @jve:decl-index=0:visual-constraint="10,10"
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/gui/panels/ZoomControlPanel.java
610 610
			       	Cancellable cancellable = new CancellableClass();
611 611
			        if(zoomControl.getDialog().isEnlarge()){
612 612
			        	if(zoomControl.getNumberPoint() != -1){
613
					       	draw(null, (Graphics2D) dbGraphics, newViewPort,cancellable ,flayers.getFMap().getScaleView());
613
					       	draw(new BufferedImage(newViewPort.getImageWidth(), newViewPort.getImageHeight(), BufferedImage.TYPE_INT_ARGB), 
614
					       		 (Graphics2D) dbGraphics, 
615
					       		 newViewPort,
616
					       		 cancellable ,
617
					       		 flayers.getFMap().getScaleView());
614 618
					       	if(zoomControl.isRightControl()){
615 619
					       		if(drawRedCrux)
616 620
						       		zoomControl.getLyrPoints().drawPixelCrux((Graphics2D) dbGraphics, newViewPort, cancellable);
......
622 626
			        	}
623 627
			        }
624 628
			        	
625
			        draw(null, gTmp, newViewPort, cancellable, flayers.getFMap().getScaleView());
629
			        draw(new BufferedImage(newViewPort.getImageWidth(), newViewPort.getImageHeight(), BufferedImage.TYPE_INT_ARGB), 
630
			        	 gTmp, 
631
			        	 newViewPort, 
632
			        	 cancellable, 
633
			        	 flayers.getFMap().getScaleView());
626 634
				    	if(zoomControl.isRightControl()){
627 635
				    		if(drawRedCrux)
628 636
				    			zoomControl.getLyrPoints().drawPixelCrux(gTmp, newViewPort, cancellable);
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/gui/pointsTable/ButtonsExportImportPanel.java
1
package org.gvsig.georeferencing.gui.pointsTable;
2

  
3
import java.awt.FlowLayout;
4

  
5
import javax.swing.ImageIcon;
6
import javax.swing.JButton;
7
import javax.swing.JPanel;
8

  
9
import com.iver.andami.PluginServices;
10

  
11
/**
12
 * Control para el manejo de tablas. No contiene eventos, estos deben 
13
 * ser manejados desde la clase que lo llame.
14
 * 
15
 * @author Nacho Brodin (brodin_ign@gva.es)
16
 *
17
 */
18
public class ButtonsExportImportPanel extends JPanel{
19
	
20
	//**********************Vars**********************************		
21
	private JButton 		bSave = null;
22
	private JButton 		bLoad = null;
23
	private JButton 		bExportToAscii = null;
24
	private String			pathToImages = "images/";//"/com/iver/cit/gvsig/gui/panels/images/";
25
	//**********************End Vars******************************
26
	
27
	//**********************Methods*******************************
28
	/**
29
	 * This is the default constructor
30
	 */
31
	public ButtonsExportImportPanel() {
32
		super();
33
		initialize();
34
	}
35

  
36
	/**
37
	 * This method initializes this
38
	 * 
39
	 * @return void
40
	 */
41
	private void initialize() {                
42
		this.setSize(new java.awt.Dimension(68,22));
43
		FlowLayout flowLayout5 = new FlowLayout();
44
		flowLayout5.setHgap(0);
45
		flowLayout5.setVgap(0);
46
        
47
		this.setLayout(flowLayout5);
48

  
49
		this.add(getBSave(), null);
50
		this.add(getBLoad(), null);
51
		this.add(getBExportToAscii(), null);
52
	}
53
	//**********************End Methods***************************	
54
	
55
	//**********************Getters & Setters*********************
56
	/**
57
	 * This method initializes jButton	
58
	 * 	
59
	 * @return javax.swing.JButton	
60
	 */    
61
	public JButton getBLoad() {
62
		if (bLoad == null) {
63
			bLoad = new JButton();
64
			bLoad.setPreferredSize(new java.awt.Dimension(22,22));
65
			bLoad.setEnabled(true);
66
			bLoad.setIcon(new ImageIcon(getClass().getClassLoader().getResource(pathToImages + "load.png")));
67
			bLoad.setToolTipText(PluginServices.getText(this, "load_from_xml"));
68
		}
69
		return bLoad;
70
	}
71
	
72
	/**
73
	 * This method initializes bSave	
74
	 * 	
75
	 * @return javax.swing.JButton	
76
	 */
77
	public JButton getBSave() {
78
		if (bSave == null) {
79
			bSave = new JButton();
80
			bSave.setText("");
81
			bSave.setEnabled(false);
82
			bSave.setPreferredSize(new java.awt.Dimension(22,22));
83
			bSave.setIcon(new ImageIcon(getClass().getClassLoader().getResource(pathToImages + "save.png")));
84
			bSave.setActionCommand("");
85
			bSave.setToolTipText(PluginServices.getText(this, "save_to_xml"));
86
		}
87
		return bSave;
88
	}
89
	
90
	/**
91
	 * This method initializes jButton	
92
	 * 	
93
	 * @return javax.swing.JButton	
94
	 */    
95
	public JButton getBExportToAscii() { 
96
		if (bExportToAscii == null) {
97
			bExportToAscii = new JButton();
98
			bExportToAscii.setPreferredSize(new java.awt.Dimension(22,22));
99
			bExportToAscii.setEnabled(false);
100
			bExportToAscii.setIcon(new ImageIcon(getClass().getClassLoader().getResource(pathToImages + "exportToAscii.png")));
101
			bExportToAscii.setToolTipText(PluginServices.getText(this, "save_to_ascii"));
102
		}
103
		return bExportToAscii;
104
	}
105
	
106
	/**
107
	 * Activa o desactiva los botones de exportar capa de puntos y salvar
108
	 * la tabla a Ascii.
109
	 *@param isPossible Si vale true activa los controles de salvar y exportaci?n
110
	 *y si vale false los desactiva
111
	 */
112
	public void setSaveToDisk(boolean isPossible){
113
		this.getBSave().setEnabled(isPossible);
114
		this.getBExportToAscii().setEnabled(isPossible);
115
	}
116
	//**********************End Getters & Setters*****************
117
 }
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/gui/pointsTable/TablePointsPanel.java
52 52
														"X'", "Y'", "Error X",  
53 53
														"Error Y",  "RMS"};
54 54
	private PointTable 						table = null;
55
	private ButtonsExportImportPanel	 	pButtonsExportImportPanel = null;
55
	private TablePanelButtons	 			pTablePanelButtons = null;
56 56
	/**
57 57
	 * Estado de los botones cuando se ejecuta disableAllControls
58 58
	 */
59
	private boolean[] 					buttonsState = new boolean[3];
59
	private boolean[] 						buttonsState = new boolean[3];
60 60
	/**
61 61
	 * DisableAllControls ha sido ejecutada si est? a true esta variabled
62 62
	 */
63
	private boolean 					disableAllControls = false;
63
	private boolean 						disableAllControls = false;
64 64
	//**********************End Vars******************************
65 65
	
66 66
	//**********************Classes*******************************
......
426 426
			disableAllControls = true;
427 427
			
428 428
			//Salvamos los estados
429
			buttonsState[0] = getPButtonsExportImportPanel().getBSave().isEnabled();
430
			buttonsState[1] = getPButtonsExportImportPanel().getBLoad().isEnabled();
431
			buttonsState[2] = getPButtonsExportImportPanel().getBExportToAscii().isEnabled();
429
			buttonsState[0] = getPTablePanelButtons().getBSave().isEnabled();
430
			buttonsState[1] = getPTablePanelButtons().getBLoad().isEnabled();
431
			buttonsState[2] = getPTablePanelButtons().getBExportToAscii().isEnabled();
432 432
			
433 433
			//Desactivamos controles
434
			getPButtonsExportImportPanel().getBSave().setEnabled(false);
435
			getPButtonsExportImportPanel().getBLoad().setEnabled(false);
436
			getPButtonsExportImportPanel().getBExportToAscii().setEnabled(false);
434
			getPTablePanelButtons().getBSave().setEnabled(false);
435
			getPTablePanelButtons().getBLoad().setEnabled(false);
436
			getPTablePanelButtons().getBExportToAscii().setEnabled(false);
437 437
		}
438 438
	}
439 439
	
......
444 444
	public void restoreControlsValue(){
445 445
		if(disableAllControls){
446 446
			disableAllControls = false;
447
			getPButtonsExportImportPanel().getBSave().setEnabled(buttonsState[0]);
448
			getPButtonsExportImportPanel().getBLoad().setEnabled(buttonsState[1]);
449
			getPButtonsExportImportPanel().getBExportToAscii().setEnabled(buttonsState[2]);
447
			getPTablePanelButtons().getBSave().setEnabled(buttonsState[0]);
448
			getPTablePanelButtons().getBLoad().setEnabled(buttonsState[1]);
449
			getPTablePanelButtons().getBExportToAscii().setEnabled(buttonsState[2]);
450 450
		}
451 451
	}
452 452
	//**********************End Methods*****************************
......
486 486
				flowLayout6.setHgap(0);
487 487
				flowLayout6.setVgap(2);
488 488
				pPointSelection.add(tableControlerPanel, null);
489
				pPointSelection.add(getPButtonsExportImportPanel(), null);
489
				pPointSelection.add(getPTablePanelButtons(), null);
490 490
				pPointSelection.setBorder(javax.swing.BorderFactory.createLineBorder(java.awt.Color.gray,1));
491 491
				tableControlerPanel.getBFirst().addActionListener(this);
492 492
				tableControlerPanel.getBLast().addActionListener(this);
493 493
				tableControlerPanel.getBNext().addActionListener(this);
494 494
				tableControlerPanel.getBPrev().addActionListener(this);
495
				tableControlerPanel.getBNew().setVisible(false);
496 495
				tableControlerPanel.getCPoint().addActionListener(this);
497 496
			}
498 497
		}
......
565 564
	 * 	
566 565
	 * @return javax.swing.JPanel	
567 566
	 */
568
	public ButtonsExportImportPanel getPButtonsExportImportPanel() {
569
		if (pButtonsExportImportPanel == null) {
570
			pButtonsExportImportPanel = new ButtonsExportImportPanel();
567
	public TablePanelButtons getPTablePanelButtons() {
568
		if (pTablePanelButtons == null) {
569
			pTablePanelButtons = new TablePanelButtons();
571 570
		}
572
		return pButtonsExportImportPanel;
571
		return pTablePanelButtons;
573 572
	}
574 573
	
575 574
	/**
......
579 578
	 *y si vale false los desactiva
580 579
	 */
581 580
	public void setSaveToDisk(boolean isPossible){
582
		this.getPButtonsExportImportPanel().setSaveToDisk(isPossible);
581
		this.getPTablePanelButtons().setSaveToDisk(isPossible);
583 582
	}
584 583
	//**********************End Setters & Getters*******************
585 584
}
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/gui/pointsTable/TablePanelButtons.java
1
package org.gvsig.georeferencing.gui.pointsTable;
2

  
3
import java.awt.FlowLayout;
4

  
5
import javax.swing.ImageIcon;
6
import javax.swing.JButton;
7
import javax.swing.JPanel;
8

  
9
import com.iver.andami.PluginServices;
10
import com.iver.andami.ui.mdiFrame.JToggleButton;
11
import com.iver.cit.gvsig.gui.View;
12

  
13
/**
14
 * Control para el manejo de tablas. No contiene eventos, estos deben 
15
 * ser manejados desde la clase que lo llame.
16
 * 
17
 * @author Nacho Brodin (brodin_ign@gva.es)
18
 *
19
 */
20
public class TablePanelButtons extends JPanel{
21
	
22
	//**********************Vars**********************************		
23
	private JButton 		bSave = null;
24
	private JButton 		bLoad = null;
25
	private JButton 		bExportToAscii = null;
26
	private JToggleButton 	bInsertPoint = null;
27
	private String			pathToImages = "images/";//"/com/iver/cit/gvsig/gui/panels/images/";
28
	//**********************End Vars******************************
29
	
30
	//**********************Methods*******************************
31
	/**
32
	 * This is the default constructor
33
	 */
34
	public TablePanelButtons() {
35
		super();
36
		initialize();
37
	}
38

  
39
	/**
40
	 * This method initializes this
41
	 * 
42
	 * @return void
43
	 */
44
	private void initialize() {                
45
		this.setSize(new java.awt.Dimension(91,22));
46
		FlowLayout flowLayout5 = new FlowLayout();
47
		flowLayout5.setHgap(0);
48
		flowLayout5.setVgap(0);
49
        
50
		this.setLayout(flowLayout5);
51

  
52
		this.add(getBInsertPoint(), null);
53
		this.add(getBSave(), null);
54
		this.add(getBLoad(), null);
55
		this.add(getBExportToAscii(), null);
56
	}
57
	//**********************End Methods***************************	
58
	
59
	//**********************Getters & Setters*********************
60
	/**
61
	 * This method initializes jButton	
62
	 * 	
63
	 * @return javax.swing.JButton	
64
	 */    
65
	public JToggleButton getBInsertPoint() {
66
		if (bInsertPoint == null) {
67
			bInsertPoint = new JToggleButton();
68
			bInsertPoint.setText("");
69
			bInsertPoint.setPreferredSize(new java.awt.Dimension(22,22));
70
			bInsertPoint.setIcon(new ImageIcon(getClass().getClassLoader().getResource(pathToImages + "selectfromview.png")));
71
			bInsertPoint.setEnabled(false);
72
			bInsertPoint.setSelected(true);
73
			bInsertPoint.setToolTipText(PluginServices.getText(this, "selectfromview"));
74
		}
75
		return bInsertPoint;
76
	}
77
	
78
	/**
79
	 * This method initializes jButton	
80
	 * 	
81
	 * @return javax.swing.JButton	
82
	 */    
83
	public JButton getBLoad() {
84
		if (bLoad == null) {
85
			bLoad = new JButton();
86
			bLoad.setPreferredSize(new java.awt.Dimension(22,22));
87
			bLoad.setEnabled(true);
88
			bLoad.setIcon(new ImageIcon(getClass().getClassLoader().getResource(pathToImages + "load.png")));
89
			bLoad.setToolTipText(PluginServices.getText(this, "load_from_xml"));
90
		}
91
		return bLoad;
92
	}
93
	
94
	/**
95
	 * This method initializes bSave	
96
	 * 	
97
	 * @return javax.swing.JButton	
98
	 */
99
	public JButton getBSave() {
100
		if (bSave == null) {
101
			bSave = new JButton();
102
			bSave.setText("");
103
			bSave.setEnabled(false);
104
			bSave.setPreferredSize(new java.awt.Dimension(22,22));
105
			bSave.setIcon(new ImageIcon(getClass().getClassLoader().getResource(pathToImages + "save.png")));
106
			bSave.setActionCommand("");
107
			bSave.setToolTipText(PluginServices.getText(this, "save_to_xml"));
108
		}
109
		return bSave;
110
	}
111
	
112
	/**
113
	 * This method initializes jButton	
114
	 * 	
115
	 * @return javax.swing.JButton	
116
	 */    
117
	public JButton getBExportToAscii() { 
118
		if (bExportToAscii == null) {
119
			bExportToAscii = new JButton();
120
			bExportToAscii.setPreferredSize(new java.awt.Dimension(22,22));
121
			bExportToAscii.setEnabled(false);
122
			bExportToAscii.setIcon(new ImageIcon(getClass().getClassLoader().getResource(pathToImages + "exportToAscii.png")));
123
			bExportToAscii.setToolTipText(PluginServices.getText(this, "save_to_ascii"));
124
		}
125
		return bExportToAscii;
126
	}
127
	
128
	/**
129
	 * Activa o desactiva los botones de exportar capa de puntos y salvar
130
	 * la tabla a Ascii.
131
	 *@param isPossible Si vale true activa los controles de salvar y exportaci?n
132
	 *y si vale false los desactiva
133
	 */
134
	public void setSaveToDisk(boolean isPossible){
135
		this.getBSave().setEnabled(isPossible);
136
		this.getBExportToAscii().setEnabled(isPossible);
137
	}
138
	//**********************End Getters & Setters*****************
139
 }
0 140

  
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/gui/pointsTable/TableControlerPanel.java
59 59
	 * @return void
60 60
	 */
61 61
	private void initialize() {                
62
		this.setPreferredSize(new java.awt.Dimension(290,22));
62
		this.setPreferredSize(new java.awt.Dimension(280,22));
63 63
		FlowLayout flowLayout5 = new FlowLayout();
64 64
		flowLayout5.setHgap(0);
65 65
		flowLayout5.setVgap(0);
......
216 216
		if(lNumberOfPoints == null){
217 217
			lNumberOfPoints = new JLabel();
218 218
			lNumberOfPoints.setText(PluginServices.getText(this, "de")+" 0");
219
			lNumberOfPoints.setPreferredSize(new java.awt.Dimension(40,15));
219
			lNumberOfPoints.setPreferredSize(new java.awt.Dimension(30,15));
220 220
		}
221 221
		return lNumberOfPoints;
222 222
	}
trunk/extensions/extGeoreferencing/src/org/gvsig/georeferencing/toc/GeoRasterTocMenuEntry.java
165 165
		        		if(lyrGeoRaster.getFLyrPoints().getCountPoints() > 0){
166 166
		        			geoDialog.getConectorPanel().getDataPointsTabPanel().getSelectPointsPanel().getTableControlerPanel().getBDelPoint().setEnabled(true);
167 167
		        			geoDialog.getConectorPanel().getDataPointsTabPanel().getSelectPointsPanel().getTableControlerPanel().getBClear().setEnabled(true);
168
		        			geoDialog.getConectorPanel().getDataPointsTabPanel().getTablePointsPanel().getPButtonsExportImportPanel().getBSave().setEnabled(true);
169
		        			geoDialog.getConectorPanel().getDataPointsTabPanel().getTablePointsPanel().getPButtonsExportImportPanel().getBExportToAscii().setEnabled(true);
168
		        			geoDialog.getConectorPanel().getDataPointsTabPanel().getTablePointsPanel().getPTablePanelButtons().getBSave().setEnabled(true);
169
		        			geoDialog.getConectorPanel().getDataPointsTabPanel().getTablePointsPanel().getPTablePanelButtons().getBExportToAscii().setEnabled(true);
170 170
		        		}
171 171
		        		
172 172
		        		//Cargamos la tabla de puntos al abrir el dialogo con el valor actual de estos

Also available in: Unified diff