Revision 6179

View differences:

trunk/extensions/extGeoprocessingExtensions/config/text.properties
1 1
#text.properties
2 2
Error_offset_no_numerico=Error. Se han introducido valores de desplazamiento no v?lidos
3
Error_proyecciones_iguales=Error. Las proyecciones de origen y destino son iguales.
3 4
Introducir_valores_desplazamiento=Valores de desplazamiento.
4 5
Reproyeccion._Introduccion_de_datos=Reproyecci?n. Introducci?n de datos
5 6
xOffset=Desplazamiento en X
trunk/extensions/extGeoprocessingExtensions/config/text_en.properties
1 1
#text_en.properties
2 2

  
3 3
Error_offset_no_numerico=Error. Invalid offset values.
4
Error_proyecciones_iguales=Error. Source and target projections are equals.
4 5
Introducir_valores_desplazamiento=Offset values
5 6
Reproyeccion._Introduccion_de_datos=Reproject. Data input.
6 7
yOffset=Y Offset
trunk/extensions/extGeoprocessingExtensions/src/com/iver/cit/gvsig/geoprocess/impl/AbstractGeoprocessGridbagPanel.java
45 45
 *
46 46
 * $Id$
47 47
 * $Log$
48
 * Revision 1.1  2006-07-03 20:28:20  azabala
48
 * Revision 1.2  2006-07-04 16:43:18  azabala
49 49
 * *** empty log message ***
50 50
 *
51
 * Revision 1.1  2006/07/03 20:28:20  azabala
52
 * *** empty log message ***
51 53
 *
54
 *
52 55
 */
53 56
package com.iver.cit.gvsig.geoprocess.impl;
54 57

  
55 58
import java.awt.Component;
59
import java.awt.GridBagConstraints;
56 60
import java.awt.Rectangle;
57 61
import java.awt.event.ItemEvent;
58 62
import java.io.File;
......
133 137
	 */
134 138
	protected JCheckBox selectedOnlyCheckBox;
135 139
	
136
	/**
137
	 * Panel where user can select the result layer
138
	 */
139
	protected JPanel resultSelectionPanel;
140
	protected JTextField resultTf;
140 141
	
141
	
142 142
	/**
143 143
	 * Default constructor
144 144
	 *
......
152 152
	}
153 153
	
154 154
	protected void initialize(){
155
		addComponent(new JLabel(titleText));
155
		addComponent(new JLabel(titleText), GridBagConstraints.NONE);
156 156
		JLabel coverageText = new JLabel(PluginServices.
157 157
				getText(this, "Cobertura_de_entrada")+":");
158 158
		JComboBox layersComboBox = getLayersComboBox();
159
		addComponent(coverageText, layersComboBox);
160
		addComponent(getSelectedOnlyCheckBox());
159
		addComponent(coverageText, layersComboBox, GridBagConstraints.NONE);
160
		addComponent(getSelectedOnlyCheckBox(), GridBagConstraints.NONE);
161 161
		
162 162
		addSpecificDesign();
163 163
		
164
		addComponent(getResultPanel());
164
		JLabel resultLabel = new JLabel();
165
		resultLabel.setText(PluginServices.
166
				getText(this, "Cobertura_de_salida") + ":");
167
		resultTf = getFileNameResultTextField();
168
		JButton openButton = getOpenResultButton();
169
		addComponent(resultLabel, 
170
						resultTf, 
171
						openButton, 
172
						GridBagConstraints.NONE);
173
		
174
		setBounds(0, 0, 500, 400);
165 175
	}
166 176
	
167
	protected JPanel getResultPanel() {
168
		if (resultSelectionPanel == null) {
169
			JLabel jLabel2 = new JLabel();
170
			jLabel2.setBounds(new Rectangle(4, 13, 126, 17));
171
			jLabel2.setText(PluginServices.getText(this, "Cobertura_de_salida") + ":");
172
			resultSelectionPanel = new JPanel();
173
			resultSelectionPanel.setLayout(null);
174
//			resultSelectionPanel.setBounds(new java.awt.Rectangle(26,259,443,46));
175
			resultSelectionPanel.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.RAISED));
176
			resultSelectionPanel.add(getOpenResultButton(), null);
177
			resultSelectionPanel.add(getFileNameResultTextField(), null);
178
			resultSelectionPanel.add(jLabel2, null);
179
		}
180
		return resultSelectionPanel;
181
	}
182 177
	
178
	
183 179
	private JButton getOpenResultButton() {
184 180
		JButton	openResultButton = new JButton();
185 181
		openResultButton.setBounds(new Rectangle(311, 12, 101, 21));
......
397 393

  
398 394
	
399 395
	protected JTextField getFileNameResultTextField() {
400
		JTextField jTextField = new JTextField();
401
		jTextField.setBounds(new Rectangle(135, 11, 169, 21));
402
		
403
		return jTextField;
396
		if(resultTf == null)
397
			resultTf = new JTextField();
398
		return resultTf;
404 399
	}
405 400

  
406 401
	public File getOutputFile() {
trunk/extensions/extGeoprocessingExtensions/src/com/iver/cit/gvsig/geoprocess/impl/reproject/ReprojectGeoprocessPlugin.java
45 45
 *
46 46
 * $Id$
47 47
 * $Log$
48
 * Revision 1.1  2006-07-03 20:28:29  azabala
48
 * Revision 1.2  2006-07-04 16:43:18  azabala
49 49
 * *** empty log message ***
50 50
 *
51
 * Revision 1.1  2006/07/03 20:28:29  azabala
52
 * *** empty log message ***
51 53
 *
54
 *
52 55
 */
53 56
package com.iver.cit.gvsig.geoprocess.impl.reproject;
54 57

  
......
61 64
import com.iver.cit.gvsig.geoprocess.core.gui.IGeoprocessPanel;
62 65
import com.iver.cit.gvsig.geoprocess.impl.reproject.gui.GeoprocessingReprojectPanel;
63 66
import com.iver.cit.gvsig.geoprocess.impl.xyshift.XYShiftGeoprocessPlugin;
64
import com.iver.cit.gvsig.geoprocess.impl.xyshift.gui.GeoprocessingXYShiftPanel;
65 67
import com.iver.cit.gvsig.gui.View;
66 68

  
67 69
public class ReprojectGeoprocessPlugin implements IGeoprocessPlugin {
68 70

  
69 71
	public IGeoprocessPanel getGeoprocessPanel() {
70
		View vista = (View) PluginServices.getMDIManager().getActiveView();
72
		com.iver.andami.ui.mdiManager.View view = PluginServices.getMDIManager().getActiveView();
73
		View vista = (View) view;
71 74
		FLayers layers = vista.getModel().getMapContext().getLayers();
72 75
		return (IGeoprocessPanel) new GeoprocessingReprojectPanel(layers);
73 76
	}
trunk/extensions/extGeoprocessingExtensions/src/com/iver/cit/gvsig/geoprocess/impl/reproject/ReprojectGeoprocessController.java
45 45
*
46 46
* $Id$
47 47
* $Log$
48
* Revision 1.1  2006-07-03 20:28:29  azabala
48
* Revision 1.2  2006-07-04 16:43:18  azabala
49 49
* *** empty log message ***
50 50
*
51
* Revision 1.1  2006/07/03 20:28:29  azabala
52
* *** empty log message ***
51 53
*
54
*
52 55
*/
53 56
package com.iver.cit.gvsig.geoprocess.impl.reproject;
54 57

  
......
122 125
		boolean onlySelected = panel.isFirstOnlySelected();
123 126
		params.put("firstlayerselection", new Boolean(onlySelected));
124 127
		IProjection projection = panel.getTargetProjection();
128
		IProjection previousProj = inputLayer.getProjection();
129
		if(previousProj.equals(projection)){
130
			String error = PluginServices.getText(this, "Error_entrada_datos");
131
			String errorDesc = PluginServices.getText(this, "Error_proyecciones_iguales");
132
			panel.error(errorDesc, error);
133
			return false;
134
		}
125 135
		params.put("targetProjection", projection);
126 136
		
127 137
		try {
trunk/extensions/extGeoprocessingExtensions/src/com/iver/cit/gvsig/geoprocess/impl/reproject/fmap/ReprojectGeoprocess.java
45 45
 *
46 46
 * $Id$
47 47
 * $Log$
48
 * Revision 1.1  2006-07-03 20:28:38  azabala
48
 * Revision 1.2  2006-07-04 16:43:18  azabala
49 49
 * *** empty log message ***
50 50
 *
51
 * Revision 1.1  2006/07/03 20:28:38  azabala
52
 * *** empty log message ***
51 53
 *
54
 *
52 55
 */
53 56
package com.iver.cit.gvsig.geoprocess.impl.reproject.fmap;
54 57

  
......
285 288
		public void run() throws Exception {
286 289
			processor =
287 290
				new FeaturePersisterProcessor2(writer);
288
			FBitSet selection = firstLayer.getRecordset().getSelection();
291
			FBitSet selection = null;
292
			if(onlyInputLayerSelection)
293
				selection = firstLayer.getRecordset().getSelection();
289 294
			IProjection from = firstLayer.getProjection();
290 295
			IProjection to = targetProjection;
291 296
			ICoordTrans ct = new CoordTrans((CoordSys) from, (CoordSys) to);
......
312 317
	}
313 318

  
314 319
	public IMonitorableTask createTask() {
315
		if(task != null)
320
		if(task == null)
316 321
			task = new ReprojectTask();
317 322
		return task;
318 323
	}
trunk/extensions/extGeoprocessingExtensions/src/com/iver/cit/gvsig/geoprocess/impl/reproject/gui/GeoprocessingReprojectPanel.java
45 45
*
46 46
* $Id$
47 47
* $Log$
48
* Revision 1.1  2006-07-03 20:28:56  azabala
48
* Revision 1.2  2006-07-04 16:43:18  azabala
49 49
* *** empty log message ***
50 50
*
51
* Revision 1.1  2006/07/03 20:28:56  azabala
52
* *** empty log message ***
51 53
*
54
*
52 55
*/
53 56
package com.iver.cit.gvsig.geoprocess.impl.reproject.gui;
54 57

  
......
105 108
		inputProjectionLabel = new JLabel(inputLayerProjection.getAbrev());
106 109
		targetProjectionLabel = new JLabel(targetLayerProjection.getAbrev());
107 110
		addComponent(PluginServices.getText(this, "Proyeccion_Actual"),
108
				inputProjectionLabel);
111
				inputProjectionLabel, GridBagConstraints.NONE);
109 112
		
110 113
		addComponent(new JLabel(PluginServices.getText(this, "Proyeccion_Destino")),
111 114
				targetProjectionLabel,
112 115
				getOpenProjectionDialogButton(),
113
				GridBagConstraints.BOTH);
116
				GridBagConstraints.NONE);
114 117
	}
115 118
	
116 119
	
trunk/extensions/extGeoProcessing/config/config.xml
27 27
					action-command="GEOPROCESSING" tooltip="Herramientas_de_analisis"
28 28
					enable-text="deber?a de estar activada" last="true" position="1"/>
29 29
					
30
<!--					
30 31
				<action-tool icon="images/buffericon.png"
31 32
					action-command="BUFFER" tooltip="Area_de_influencia"
32 33
					last="true" position="2"/>
......
61 62
				<action-tool icon="images/spatialjoin.png"
62 63
					action-command="SPATIAL_JOIN" tooltip="Enlace_espacial"
63 64
					last="true" position="10"/>	
65
-->					
64 66
			</tool-bar>
65 67
		</extension>
66 68
	</extensions>
trunk/extensions/extGeoProcessing/src/com/iver/cit/gvsig/geoprocess/core/gui/GeoprocessPaneContainer.java
45 45
 *
46 46
 * $Id$
47 47
 * $Log$
48
 * Revision 1.2  2006-05-25 08:20:43  jmvivo
48
 * Revision 1.3  2006-07-04 16:42:37  azabala
49
 * *** empty log message ***
50
 *
51
 * Revision 1.2  2006/05/25 08:20:43  jmvivo
49 52
 * Modificado para que, si el proceso no ha podido ejecutarse, no cierre la ventana
50 53
 *
51 54
 * Revision 1.1  2006/05/24 21:13:09  azabala
......
113 116
			viewInfo = new ViewInfo(ViewInfo.MODALDIALOG);
114 117
			viewInfo.setTitle(PluginServices.getText(this,
115 118
					"Herramientas_de_analisis"));
119
			viewInfo.setWidth(450);
120
			viewInfo.setHeight(350);
116 121
		}
117 122
		return viewInfo;
118 123
	}
......
141 146
	 */
142 147
	private void initialize() {
143 148
		this.setLayout(new BorderLayout());
144
		this.setBounds(new java.awt.Rectangle(0,0,500,400));
145 149
		this.add(getButtonPanel(), java.awt.BorderLayout.SOUTH);
146 150
		this.add(getMainPanel(), java.awt.BorderLayout.CENTER);
147 151
		this.validate();
trunk/extensions/extGeoProcessing/src/com/iver/cit/gvsig/geoprocess/manager/GeoprocessManager.java
45 45
 *
46 46
 * $Id$
47 47
 * $Log$
48
 * Revision 1.3  2006-06-27 16:16:49  azabala
48
 * Revision 1.4  2006-07-04 16:42:37  azabala
49
 * *** empty log message ***
50
 *
51
 * Revision 1.3  2006/06/27 16:16:49  azabala
49 52
 * imports organization
50 53
 *
51 54
 * Revision 1.2  2006/06/27 16:15:08  azabala
......
160 163
	
161 164
	public ViewInfo getViewInfo() {
162 165
		if (viewInfo == null) {
163
			viewInfo = new ViewInfo(ViewInfo.MODALDIALOG | 
166
			viewInfo = new ViewInfo(ViewInfo.MODELESSDIALOG | 
164 167
										ViewInfo.RESIZABLE | 
165 168
										ViewInfo.PALETTE);
166
			viewInfo.setTitle("Gestor de Geoprocesos");
167
			viewInfo.setWidth(600);
169
			viewInfo.setTitle(PluginServices.
170
					getText(this, "Gestor_de_Geoprocesos"));
171
			viewInfo.setWidth(500);
168 172
			viewInfo.setHeight(450);
169
//			viewInfo.setWidth(this.getWidth()+8);
170
//			viewInfo.setHeight(this.getHeight());
171 173
		}
172 174
		return viewInfo;
173 175
	}

Also available in: Unified diff