Revision 30840

View differences:

trunk/extensions/extGraph/src/org/gvsig/graph/gui/ConnectivityControlPanel.java
175 175
		if (jPanelCenter == null) {
176 176
			jLblAssociatedLayer = new JLabel();
177 177
			jLblAssociatedLayer.setBounds(new Rectangle(15, 57, 111, 14));
178
			jLblAssociatedLayer.setText("Capa asociada:");
178
			jLblAssociatedLayer.setText(_T("Associated_layer") + ":");
179 179
			jLblOriginPoint = new JLabel();
180 180
			jLblOriginPoint.setBounds(new Rectangle(15, 17, 111, 14));
181
			jLblOriginPoint.setText("Punto or?gen:");
181
			jLblOriginPoint.setText(_T("Origin_point") + ":");
182 182
			jPanelCenter = new JPanel();
183 183
			jPanelCenter.setLayout(null);
184 184
			jPanelCenter.add(jLblOriginPoint, null);
......
360 360
	private JButton getJBtnCalculate() {
361 361
		if (jBtnCalculate == null) {
362 362
			jBtnCalculate = new JButton();
363
			jBtnCalculate.setText("Calcular");
363
			jBtnCalculate.setText(_T("Calculate"));
364 364
			jBtnCalculate.addActionListener(new ActionListener() {
365 365
				public void actionPerformed(ActionEvent e) {
366 366
					doConnectivityAnalisys();
......
476 476
			double tol = mapCtrl.getViewPort().toMapDistance(FlagListener.pixelTolerance);
477 477
			sourceFlag = net.createFlag(x, y, tol);
478 478
			if (sourceFlag == null) {
479
				JOptionPane.showMessageDialog(this, "Error al posicionar el punto sobre la red.");
479
				JOptionPane.showMessageDialog(this, _T("Error positioning point on network."));
480 480
				return;				
481 481
			}
482 482
			solver.setSourceFlag(sourceFlag);
483 483
		}
484 484
		catch (NumberFormatException e) {
485
			JOptionPane.showMessageDialog(this, "Error en las coordenadas del punto de or?gen:" + e.getMessage());
485
			JOptionPane.showMessageDialog(this, _T("Error in origin coordinates:" + e.getMessage()));
486 486
			return;
487 487
		}
488 488
		long t1 = System.currentTimeMillis();
......
534 534
			jPanelOptions.setLayout(null);
535 535
			jPanelOptions.setBounds(new Rectangle(15, 87, 315, 140));
536 536
			jPanelOptions.setBorder(BorderFactory.createTitledBorder(null,
537
					"Options", TitledBorder.DEFAULT_JUSTIFICATION,
537
					_T("Options"), TitledBorder.DEFAULT_JUSTIFICATION,
538 538
					TitledBorder.DEFAULT_POSITION, new Font("Tahoma",
539 539
							Font.PLAIN, 11), Color.black));
540 540
			ButtonGroup group = new ButtonGroup();
......
560 560
			jRadioBtnNormalDirection = new JRadioButton();
561 561
			jRadioBtnNormalDirection.setBounds(new Rectangle(15, 25, 200, 21));
562 562
			jRadioBtnNormalDirection.setSelected(true);
563
			jRadioBtnNormalDirection.setText("Sentido normal");
563
			jRadioBtnNormalDirection.setText(_T("Normal_direction"));
564 564
		}
565 565
		return jRadioBtnNormalDirection;
566 566
	}
......
574 574
		if (jRadioBtnReverseDirection == null) {
575 575
			jRadioBtnReverseDirection = new JRadioButton();
576 576
			jRadioBtnReverseDirection.setBounds(new Rectangle(15, 53, 180, 23));
577
			jRadioBtnReverseDirection.setText("Sentido inverso");
577
			jRadioBtnReverseDirection.setText(_T("Reverse_direction"));
578 578
			jRadioBtnReverseDirection.setSelected(false);
579 579
		}
580 580
		return jRadioBtnReverseDirection;
......
589 589
		if (jChkBoxUseMaxDist == null) {
590 590
			jChkBoxUseMaxDist = new JCheckBox();
591 591
			jChkBoxUseMaxDist.setBounds(new Rectangle(15, 85, 168, 21));
592
			jChkBoxUseMaxDist.setText("Usar distancia m?xima:");
592
			jChkBoxUseMaxDist.setText(_T("Use_max_distance") + ":");
593 593
		}
594 594
		return jChkBoxUseMaxDist;
595 595
	}
......
603 603
		if (jChkBoxUseMaxCost == null) {
604 604
			jChkBoxUseMaxCost = new JCheckBox();
605 605
			jChkBoxUseMaxCost.setBounds(new Rectangle(15, 112, 167, 23));
606
			jChkBoxUseMaxCost.setText("Usar coste m?ximo:");
606
			jChkBoxUseMaxCost.setText(_T("Use_max_cost") + ":");
607 607
		}
608 608
		return jChkBoxUseMaxCost;
609 609
	}
......
640 640
			wi.setWidth(345);
641 641
			wi.setHeight(345);
642 642
			wi.setMinimumSize(new Dimension(345, 345));
643
			wi.setTitle(PluginServices.getText(this, "connectivity_analisys")
643
			wi.setTitle(PluginServices.getText(this, "connectivity_analysis")
644 644
					+ "...");
645 645
		}
646 646
		return wi;
......
725 725
		}
726 726
		
727 727
	}
728
	private String _T(String str) {
729
		return PluginServices.getText(this, str);
730
	}
728 731

  
729 732
} // @jve:decl-index=0:visual-constraint="10,10"
trunk/extensions/extGraph/src/org/gvsig/graph/gui/MultiInputDlg.java
127 127
		jLblMsg.setBackground(SystemColor.control);
128 128
		jLblMsg.setLineWrap(true);
129 129
		jLblMsg.setPreferredSize(new Dimension(200, 100));
130
		jLblMsg.setFocusable(false);
130 131
		
131 132
		BorderLayout layout = new BorderLayout();
132 133
		layout.setHgap(30);
......
137 138
		this.getContentPane().add(getJScrollPane(), BorderLayout.CENTER);
138 139
		MyListener myListener = new MyListener(this);
139 140
		AcceptCancelPanel okCancelPanel = new AcceptCancelPanel(myListener, myListener);
140
		btnLoadVelocities = new JButton("load_velocities");
141
		btnLoadVelocities = new JButton(PluginServices.getText(this,"load_velocities"));
141 142
		btnLoadVelocities.addActionListener(new ActionListener() {
142 143

  
143 144
			public void actionPerformed(ActionEvent e) {
......
151 152
			}
152 153
			
153 154
		});
154
		btnSaveVelocities = new JButton("save_velocities");
155
		btnSaveVelocities = new JButton(PluginServices.getText(this,"save_velocities"));
155 156
		btnSaveVelocities.addActionListener(new ActionListener() {
156 157

  
157 158
			public void actionPerformed(ActionEvent e) {
trunk/extensions/extGraph/src/org/gvsig/graph/gui/LayerSelectionPanel.java
279 279
	public WindowInfo getWindowInfo() {
280 280
		  if (wi==null) {
281 281
	            wi = new WindowInfo(WindowInfo.MODALDIALOG);
282
	            wi.setWidth(290);
282
	            wi.setWidth(350);
283 283
	            wi.setHeight(120);
284 284
	            wi.setTitle(title);
285 285
	        }
trunk/extensions/extGraph/src/org/gvsig/graph/gui/OdMatrixControlPanel.java
126 126

  
127 127
		jLblToleranceUnits = new JLabel();
128 128
		jLblToleranceUnits.setBounds(new Rectangle(265, 118, 135, 20));
129
		jLblToleranceUnits.setText("meters");
129
		jLblToleranceUnits.setText(_T("meters"));
130 130
		jLblTolerance = new JLabel();
131 131
		jLblTolerance.setBounds(new Rectangle(17, 118, 135, 20));
132
		jLblTolerance.setText("Tolerance:");
132
		jLblTolerance.setText(_T("Tolerance") + ":");
133 133
		jLblTolerance.setHorizontalAlignment(SwingConstants.RIGHT);
134 134
		this.setLayout(null);
135 135
		this.setSize(new Dimension(499, 350));
......
149 149

  
150 150
		jPanel1.setLayout(null);
151 151
		jPanel1.setBorder(javax.swing.BorderFactory
152
				.createTitledBorder("Options"));
152
				.createTitledBorder(_T("Options")));
153 153

  
154 154
		jPanel1.setBounds(new Rectangle(14, 172, 468, 122));
155 155
		jPanel1.add(cboFileFormat, null);
......
174 174
		});
175 175
		jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
176 176
		jLabel5.setBounds(new Rectangle(17, 22, 134, 16));
177
		jLabel5.setText("File Format:");
177
		jLabel5.setText(_T("File_Format") + ":");
178 178

  
179 179
		jPanel2.setLayout(null);
180 180

  
181 181
		// jPanel2.setLayout(new GridBagLayout(jPanel2, BoxLayout.Y_AXIS));
182 182
		jPanel2.setBorder(javax.swing.BorderFactory
183
				.createTitledBorder("Parameters"));
183
				.createTitledBorder(_T("Parameters")));
184 184

  
185 185
		jPanel2.setBounds(new Rectangle(14, 13, 468, 144));
186 186

  
......
188 188
		jLblLayerOrigins
189 189
				.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
190 190
		jLblLayerOrigins.setBounds(new Rectangle(17, 33, 135, 20));
191
		jLblLayerOrigins.setText("Layer Origins:");
191
		jLblLayerOrigins.setText(_T("Layer_Origins") + ":");
192 192

  
193 193
		cboLayerDestinations.setBounds(new Rectangle(158, 61, 259, 22));
194 194
		jLblLayerDestinations
195 195
				.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
196 196
		jLblLayerDestinations.setBounds(new Rectangle(17, 59, 135, 20));
197
		jLblLayerDestinations.setText("Layer Destinations:");
197
		jLblLayerDestinations.setText(_T("Layer_Destinations") + ":");
198 198

  
199 199
		jLblFile.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
200 200
		jLblFile.setBounds(new Rectangle(17, 90, 135, 20));
201
		jLblFile.setText("Generated File:");
201
		jLblFile.setText(_T("Generated_File") + ":");
202 202

  
203 203
		txtGeneratedFile.setText("");
204 204

  
......
228 228
				
229 229
			}
230 230
		});
231
		btnOk.setText("OK");
231
		btnOk.setText(_T("OK"));
232 232
		btnOk.setBounds(new Rectangle(107, 305, 136, 26));
233 233
		btnOk.addActionListener(new java.awt.event.ActionListener() {
234 234
			public void actionPerformed(java.awt.event.ActionEvent evt) {
......
236 236
			}
237 237
		});
238 238

  
239
		btnCancel.setText("Cancel");
239
		btnCancel.setText(_T("Cancel"));
240 240
		btnCancel.setBounds(new Rectangle(257, 305, 136, 26));
241 241
		jPanel2.add(jLblLayerOrigins, null);
242 242
		jPanel2.add(cboLayerOrigins, null);
......
348 348
			wi = new WindowInfo(WindowInfo.MODALDIALOG);
349 349
			wi.setWidth((int) this.getPreferredSize().getWidth());
350 350
			wi.setHeight((int) this.getPreferredSize().getHeight());
351
			wi.setTitle(PluginServices.getText(this, "odmatrix_control_panel"));
351
			wi.setTitle(_T("odmatrix_control_panel"));
352 352
		}
353 353
		return wi;
354 354
	}
......
360 360
	public double getTolerance() {
361 361
		return Double.parseDouble(txtTolerance.getText());
362 362
	}
363
	
364
	private String _T(String str) {
365
		return PluginServices.getText(this, str);
366
	}
363 367

  
364 368
} // @jve:decl-index=0:visual-constraint="10,10"
trunk/extensions/extGraph/src/org/gvsig/graph/gui/RouteReportPanel.java
111 111
import org.gvsig.graph.solvers.Route;
112 112

  
113 113
import com.hardcode.gdbms.engine.values.DoubleValue;
114
import com.iver.andami.PluginServices;
114 115
import com.iver.andami.ui.mdiManager.IWindow;
115 116
import com.iver.andami.ui.mdiManager.WindowInfo;
116 117
import com.iver.cit.gvsig.fmap.MapControl;
......
138 139
	private WindowInfo viewInfo;
139 140
	
140 141
	
141
	private String htmlText;
142
	private StringBuilder htmlText;
142 143
	private MapControl mapControl;
143 144
	
144 145
	//Para poder poner duraci?n, etc.
......
243 244
	}
244 245
	
245 246
	private void initialize(){
246
		htmlText = "<head>";
247
		htmlText += "<style type='text/css'>";
248
		htmlText += "<!-- ";
249
		htmlText += "  .normal { ";
250
		htmlText += "	font-family: Arial, Helvetica, sans-serif;	font-size: 10px; font-style: normal; color: #333333;";
251
		htmlText += "}";
252
		htmlText += "  a { ";
253
		htmlText += "	font-family: Arial, Helvetica, sans-serif;	font-size: 10px; font-style: italic; font-weight: bold;";
254
		htmlText += "}";
255
		htmlText += "  h1 { ";
256
		htmlText += "	font-family: Arial, Helvetica, sans-serif;	font-size: 14px;";
257
		htmlText += "}";		
258
		htmlText += "  .distancia { ";
259
		htmlText += "	font-family: Arial, Helvetica, sans-serif;	font-size: 10px; color: #666666;";
260
		htmlText += "}";
261
		htmlText += "  .resumen { ";
262
		htmlText += "	font-family: Arial, Helvetica, sans-serif;	font-size: 12px; color: #333333;";
263
		htmlText += "}";
264
		htmlText += "  .left { ";
265
		htmlText += "	font-weight: bold; color: #990000;";
266
		htmlText += "}";
267
		htmlText += "  .right { ";
268
		htmlText += "	font-weight: bold; color: #0033FF;";
269
		htmlText += "}";
247
		htmlText = new StringBuilder("<head>");
248
		htmlText.append("<style type='text/css'>");
249
		htmlText.append("<!-- ");
250
		htmlText.append("  .normal { ");
251
		htmlText.append("	font-family: Arial, Helvetica, sans-serif;	font-size: 10px; font-style: normal; color: #333333;");
252
		htmlText.append("}");
253
		htmlText.append("  a { ");
254
		htmlText.append("	font-family: Arial, Helvetica, sans-serif;	font-size: 10px; font-style: italic; font-weight: bold;");
255
		htmlText.append("}");
256
		htmlText.append("  h1 { ");
257
		htmlText.append("	font-family: Arial, Helvetica, sans-serif;	font-size: 14px;");
258
		htmlText.append("}");		
259
		htmlText.append("  .distancia { ");
260
		htmlText.append("	font-family: Arial, Helvetica, sans-serif;	font-size: 10px; color: #666666;");
261
		htmlText.append("}");
262
		htmlText.append("  .resumen { ");
263
		htmlText.append("	font-family: Arial, Helvetica, sans-serif;	font-size: 12px; color: #333333;");
264
		htmlText.append("}");
265
		htmlText.append("  .left { ");
266
		htmlText.append("	font-weight: bold; color: #990000;");
267
		htmlText.append("}");
268
		htmlText.append("  .right { ");
269
		htmlText.append("	font-weight: bold; color: #0033FF;");
270
		htmlText.append("}");
270 271
		
271
		htmlText += " -->";
272
		htmlText += "</style>";
273
		htmlText += "</head>";
274
		htmlText += "<body>";
272
		htmlText.append(" -->");
273
		htmlText.append("</style>");
274
		htmlText.append("</head>");
275
		htmlText.append("<body>");
275 276
		ArrayList features = route.getFeatureList();
276 277
		
277 278
		//Route is ordered from the the start to the end
......
292 293
		//Invertir el FIRST y el LAST
293 294
		//Borrar el graphics resaltado cuando se resalte otro
294 295
		renderLastStretch((IFeature)features.get(features.size() -1), previousFeature);
295
		htmlText += "</body>";
296
		System.out.println(htmlText);
297
		htmlPanel.setText(htmlText);
296
		htmlText.append("</body>");
297
//		System.out.println(htmlText);
298
		htmlPanel.setText(htmlText.toString());
298 299
		
299 300
	}
300 301
	
......
305 306
	private void renderHeader(IFeature firstFeature, IFeature lastFeature){
306 307
		String startName = firstFeature.getAttribute(Route.TEXT_INDEX).toString();
307 308
		String stopName = lastFeature.getAttribute(Route.TEXT_INDEX).toString();
308
		htmlText += "<h1>";
309
		htmlText += "Informe de Ruta:" + startName + "-" + stopName ;//TODO INTERNACIONALIZAR ESTO
310
		htmlText += "</h1><br>";
311
		htmlText += "<span class='resumen'>Salida desde: <b>";//TODO INTERNAC
312
		htmlText += startName;
313
		htmlText += "</b><br>";
314
		htmlText += "Llegada a:<b> ";//TODO INTERNAC
315
		htmlText += stopName + "</b><br>";
309
		htmlText.append("<h1>");
310
		htmlText.append(_T("Route_report") + ":" + startName + "-" + stopName);
311
		htmlText.append("</h1><br>");
312
		htmlText.append("<span class='resumen'>" + _T("Start_from") + ": <b>");
313
		htmlText.append(startName);
314
		htmlText.append("</b><br>");
315
		htmlText.append(_T("Arrival_to") + ":<b> ");
316
		htmlText.append(stopName + "</b><br>");
316 317
		
317
		//TODO METER LA LONGITUD TOTAL DEL TRAYECTO AQUI
318
		htmlText += "Longitud total del trayecto: <b>" + nf.format(getLengthOfRoute()) + "</b></span>";
319
		htmlText += LINE_SEPARATOR;
318
		htmlText.append(_T("Total_length") + ": <b>" + nf.format(getLengthOfRoute()) + "</b></span>");
319
		htmlText.append(LINE_SEPARATOR);
320 320
	}
321 321
	
322 322
	private double getLengthOfRoute() {
......
331 331

  
332 332

  
333 333
	private void renderFirstStrech(IFeature feature){
334
		htmlText += "<table>";
335
		htmlText += "<tr>";
336
		htmlText += "<td width='40'>";
337
		htmlText += START_IMAGE;
338
		htmlText += "</td>";
339
		htmlText += "<td class='normal'>";
340
		htmlText += "1. Salir de:<b> ";//TODO INTERNAC
341
		htmlText += feature.getAttribute(Route.TEXT_INDEX);
342
		htmlText += "</b></td></tr>";
343
		htmlText += "<tr>"; 
344
		htmlText += "<td width='40'></td><td><a href=\""+0+"\">Ver sobre el mapa</a><td></tr>";
345
		htmlText += "</table>";
346
		htmlText += LINE_SEPARATOR;
334
		htmlText.append("<table>");
335
		htmlText.append("<tr>");
336
		htmlText.append("<td width='40'>");
337
		htmlText.append(START_IMAGE);
338
		htmlText.append("</td>");
339
		htmlText.append("<td class='normal'>");
340
		htmlText.append("1. " + _T("Start_from") + ":<b> ");
341
		htmlText.append(feature.getAttribute(Route.TEXT_INDEX));
342
		htmlText.append("</b></td></tr>");
343
		htmlText.append("<tr>"); 
344
		htmlText.append("<td width='40'></td><td><a href=\""+0+"\">" + _T("Show_in_map") + "</a><td></tr>");
345
		htmlText.append("</table>");
346
		htmlText.append(LINE_SEPARATOR);
347 347
		
348 348
		double length = ((DoubleValue)feature.getAttribute(Route.LENGTH_INDEX)).getValue();
349 349
		double weight = ((DoubleValue)feature.getAttribute(Route.WEIGHT_INDEX)).getValue();
......
356 356
		tramesOfSameStreet.add(new Integer(0));
357 357
	}
358 358
	
359
	private String _T(String str) {
360
		return PluginServices.getText(this, str);
361
	}
362
	
359 363
	private void renderStrech(IFeature feature, IFeature previousFeature, int index){
360 364
		String street1 =  previousFeature.getAttribute(Route.TEXT_INDEX).toString();
361 365
		String street2 = feature.getAttribute(Route.TEXT_INDEX).toString();
......
368 372
		
369 373
		if(changeStreet){
370 374
			numberOfStreets++;
371
			String prefix = "Contin?e por <b>" + street1 + "</b> durante  "+
372
			nf.format(acumuledLenght)+" y ";
375
			String prefix = _T("follow") + " <b>" + street1 + "</b> " + _T("during") + " " +
376
			nf.format(acumuledLenght)+ " " + _T("and");
373 377
			int direction = TurnUtil.getDirection(previousFeature, feature);
374 378
			
375 379
			if(direction == TurnUtil.GO_STRAIGH_ON){
376
				textoTramo = prefix + " prosiga por <b>"+ street2 + "</b>";
380
				textoTramo = prefix + " " + _T("continue_by") + " <b> "+ street2 + "</b>";
377 381
				imageTurn = STRAIGHT_IMAGE;
378 382
				
379 383
			}else if(direction == TurnUtil.TURN_LEFT){
380
				textoTramo = prefix += " gire a la <span class='left'><b>izquierda</b></span> por <b>" + street2 + "</b>";
384
				textoTramo = prefix + " " + _T("turn") + " " + "<span class='left'><b> " + _T("left") +
385
				"</b></span> " + _T("by") + " <b>" + street2 + "</b> ";
381 386
				imageTurn = LEFT_IMAGE;
382 387
				
383 388
			}else if(direction == TurnUtil.TURN_RIGHT){
384
				textoTramo = prefix += " gire a la <span class='right'><b>derecha</b></span> por <b>" + street2 + "</b>";
389
				textoTramo = prefix + " " + _T("turn") + " <span class='right'><b> " + _T("right") + 
390
					" </b></span> " + _T("by") + " <b>" + street2 + "</b>";
385 391
				imageTurn = RIGHT_IMAGE;	
386 392
			}
387
			htmlText += "<table>";
388
			htmlText += "<tr>";
389
			htmlText += "<td width='40'>";
390
			htmlText += imageTurn;
391
			htmlText += "</td>";
392
			htmlText += "<td class='normal'>";
393
			htmlText += numberOfStreets+" "+textoTramo;//TODO INTERNAC
394
			htmlText += "</td></tr>";
395
			htmlText += "<tr>";
396
			htmlText += "<td with='40'></td><td class='distancia'>Distancia acumulada:"+nf.format(totalLenght)+"</td></tr>";
393
			htmlText.append("<table>");
394
			htmlText.append("<tr>");
395
			htmlText.append("<td width='40'>");
396
			htmlText.append(imageTurn);
397
			htmlText.append("</td>");
398
			htmlText.append("<td class='normal'>");
399
			htmlText.append(numberOfStreets+" "+textoTramo);//TODO INTERNAC
400
			htmlText.append("</td></tr>");
401
			htmlText.append("<tr>");
402
			htmlText.append("<td with='40'></td><td class='distancia'>" + _T("Accumulated_distance") + ":" +nf.format(totalLenght)+"</td></tr>");
397 403
			
398 404
			if(!weightText.equalsIgnoreCase("Longitud:"))
399 405
			{
400
				htmlText += "<tr>";
401
				htmlText += "<td with='40'></td><td class='distancia'>Coste:"+nf.format(totalWeight)+"</td></tr>";
406
				htmlText.append("<tr>");
407
				htmlText.append("<td with='40'></td><td class='distancia'>" + _T("cost") + ":" +nf.format(totalWeight)+"</td></tr>");
402 408
			}
403 409
			
404 410
			String features = "";
......
409 415
			
410 416
			features += ((Integer)tramesOfSameStreet.get(tramesOfSameStreet.size()-1)).intValue();
411 417
//			System.out.println("features = " + features);
412
			htmlText += "<tr><td with='40'></td><td><a href=\""+features+"\">Ver sobre el mapa</a><td></tr>";
413
			htmlText += "</table>";
414
			htmlText += LINE_SEPARATOR;
418
			htmlText.append("<tr><td with='40'></td><td><a href=\""+features+"\">Ver sobre el mapa</a><td></tr>");
419
			htmlText.append("</table>");
420
			htmlText.append(LINE_SEPARATOR);
415 421
			
416 422
			acumuledLenght = length;
417 423
			acumuledWeight = weight;
......
440 446
//		totalLenght += length;
441 447
//		totalWeight += weight;
442 448
		
443
		htmlText += "<table>";
444
		htmlText += "<tr>";
445
		htmlText += "<td width='40'>";
446
		htmlText += STOP_IMAGE;
447
		htmlText += "</td>";
448
		htmlText += "<td>";
449
		htmlText += numberOfStreets+". Llegada: ";//TODO INTERNAC
450
		htmlText += feature.getAttribute(Route.TEXT_INDEX);
451
		htmlText += "</td></tr>";
452
		htmlText += "<tr><td with='40'></td><td>Longitud:"+nf.format(totalLenght)+"</td></tr>";
449
		htmlText.append("<table>");
450
		htmlText.append("<tr>");
451
		htmlText.append("<td width='40'>");
452
		htmlText.append(STOP_IMAGE);
453
		htmlText.append("</td>");
454
		htmlText.append("<td class='resumen'>");
455
		htmlText.append(numberOfStreets+". " + _T("Llegada") + ":" );
456
		htmlText.append(feature.getAttribute(Route.TEXT_INDEX));
457
		htmlText.append("</td></tr>");
458
		htmlText.append("<tr><td with='40'></td><td class='resumen'>" + _T("Longitud") + ":" +nf.format(totalLenght)+"</td></tr>");
453 459
		
454 460
		if(!weightText.equalsIgnoreCase("Longitud:"))
455
			htmlText += "<tr><td with='40'></td><td class='distancia'>Coste:"+totalWeight+"</td></tr>";
456
		htmlText += "<tr><td with='40'></td><td><a href=\""+(route.getFeatureList().size()-1)+"\">Ver sobre el mapa</a><td></tr>";
457
		htmlText += "</table>";
461
			htmlText.append("<tr><td with='40'></td><td class='resumen'>Coste:"+totalWeight+"</td></tr>");
462
		htmlText.append("<tr><td with='40'></td><td><a href=\""+(route.getFeatureList().size()-1)+"\">Ver sobre el mapa</a><td></tr>");
463
		htmlText.append("</table>");
458 464
	}
459 465

  
460 466
	public WindowInfo getWindowInfo() {
trunk/extensions/extGraph/src/org/gvsig/graph/gui/ServiceAreaControlPanel.java
298 298

  
299 299
	@Override
300 300
	protected void initialize() {
301
		JButton jBtnCalculateServiceArea = new JButton("Calculate Service Areas");
301
		JButton jBtnCalculateServiceArea = new JButton(PluginServices.getText(null, "Calculate_Service_Areas"));
302 302
		jBtnCalculateServiceArea.addActionListener(new ActionListener() {
303 303

  
304 304
			public void actionPerformed(ActionEvent e) {
......
351 351
//			panelButtonsEast.add(getBtnSetVelocities());
352 352
//			panelButtonsEast.add(getChkTSP());
353 353
//			panelButtonsEast.add(getChkReturnToOrigin());
354
			panelButtonsEast.add(new JLabel(PluginServices.getText(this, "tolerance:")));
354
			panelButtonsEast.add(new JLabel(PluginServices.getText(this, "tolerance") + ":"));
355 355
			panelButtonsEast.add(getTxtTolerance());
356 356
			
357 357
			layout.setRows(panelButtonsEast.getComponentCount());
trunk/extensions/extGraph/src/org/gvsig/graph/gui/RouteControlPanel.java
722 722
			panelButtonsEast.add(getBtnCenterOnFlag());
723 723
			panelButtonsEast.add(getBtnSetVelocities());
724 724
			
725
			panelButtonsEast.add(new JLabel(PluginServices.getText(this, "tolerance:")));
725
			panelButtonsEast.add(new JLabel(PluginServices.getText(this, "tolerance") + ":"));
726 726
			panelButtonsEast.add(getTxtTolerance());
727 727
			panelButtonsEast.add(getChkTSP());
728 728
			panelButtonsEast.add(getChkReturnToOrigin());
......
749 749
			chkTSP = new JCheckBox();
750 750
			chkTSP.setText(PluginServices.getText(this,
751 751
					"order_stops"));
752
			chkTSP.setEnabled(false);
752
//			chkTSP.setEnabled(false);
753 753
			chkTSP.addActionListener(this);
754 754
		}
755 755
		return chkTSP;
......
760 760
			chkReturnToOrigin = new JCheckBox();
761 761
			chkReturnToOrigin.setText(PluginServices.getText(this,
762 762
					"return_to_origin"));
763
			chkReturnToOrigin.setEnabled(false);
763
//			chkReturnToOrigin.setEnabled(false);
764 764
			chkReturnToOrigin.addActionListener(this);
765 765
		}
766 766
		return chkReturnToOrigin;
trunk/extensions/extGraph/src/org/gvsig/graph/gui/wizard/NetWizard.java
152 152
    public WindowInfo getWindowInfo() {
153 153
        if (wi==null) {
154 154
            wi = new WindowInfo(WindowInfo.RESIZABLE | WindowInfo.MODALDIALOG);
155
            wi.setWidth(720);
155
            wi.setWidth(790);
156 156
            wi.setHeight(370);
157 157
            wi.setTitle(PluginServices.getText(this, "create_network") + "...");
158 158
        }
trunk/extensions/extGraph/src/org/gvsig/graph/core/DefaultFeatureExtractor.java
28 28
package org.gvsig.graph.core;
29 29

  
30 30
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
31
import com.hardcode.gdbms.engine.values.Value;
31 32
import com.iver.cit.gvsig.exceptions.expansionfile.ExpansionFileReadException;
32 33
import com.iver.cit.gvsig.fmap.core.IFeature;
34
import com.iver.cit.gvsig.fmap.core.IGeometry;
33 35
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
34 36
import com.iver.cit.gvsig.fmap.layers.ReadableVectorial;
37
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
35 38

  
36 39
public class DefaultFeatureExtractor implements IFeatureExtractor {
37 40

  
......
58 61
		return f;
59 62
	}
60 63

  
64
	public Value getFieldValue(long i, int idField) {
65
		
66
		Value f = null;
67
		try {
68
			SelectableDataSource rs = lyr.getSource().getRecordset();
69
			rs.start();
70
			f = rs.getFieldValue(i, idField);
71
			rs.stop();
72
		} catch (ExpansionFileReadException e) {
73
			// TODO Auto-generated catch block
74
			e.printStackTrace();
75
		} catch (ReadDriverException e) {
76
			// TODO Auto-generated catch block
77
			e.printStackTrace();
78
		}
79
		return f;
80

  
81
	}
82

  
83
	public IGeometry getGeometry(long i) {
84
		ReadableVectorial va = lyr.getSource();
85
		IGeometry f = null;
86
		try {
87
			va.start();
88
			f = va.getShape((int) i);
89
			va.stop();
90
		} catch (ExpansionFileReadException e) {
91
			// TODO Auto-generated catch block
92
			e.printStackTrace();
93
		} catch (ReadDriverException e) {
94
			// TODO Auto-generated catch block
95
			e.printStackTrace();
96
		}
97
		return f;
98

  
99
	}
100

  
61 101
}
62 102

  
trunk/extensions/extGraph/src/org/gvsig/graph/core/IFeatureExtractor.java
27 27
 
28 28
package org.gvsig.graph.core;
29 29

  
30
import com.hardcode.gdbms.engine.values.Value;
30 31
import com.iver.cit.gvsig.fmap.core.IFeature;
32
import com.iver.cit.gvsig.fmap.core.IGeometry;
31 33

  
32 34
/**
33 35
 * @author Francisco Jos? Pe?arrubia (fjp@scolab.es)
......
39 41
 */
40 42
public interface IFeatureExtractor {
41 43
	IFeature getFeature(long i);
44
	IGeometry getGeometry(long i);
45
	Value getFieldValue(long idRec, int idField);
42 46
}
43 47

  
trunk/extensions/extGraph/src/org/gvsig/graph/core/CacheFeatureExtractor.java
30 30
import java.util.ArrayList;
31 31

  
32 32
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
33
import com.hardcode.gdbms.engine.values.Value;
33 34
import com.iver.cit.gvsig.fmap.core.IFeature;
35
import com.iver.cit.gvsig.fmap.core.IGeometry;
34 36
import com.iver.cit.gvsig.fmap.drivers.IFeatureIterator;
35 37
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
36 38

  
......
66 68
		return feats.get((int) i);
67 69
	}
68 70

  
71
	public Value getFieldValue(long idRec, int idField) {
72
		return getFeature(idRec).getAttribute(idField);
73
	}
74

  
75
	public IGeometry getGeometry(long i) {
76
		return getFeature(i).getGeometry();
77
	}
78

  
69 79
}
70 80

  
trunk/extensions/extGraph/src/org/gvsig/graph/solvers/AbstractShortestPathSolver.java
42 42
import org.gvsig.graph.core.Network;
43 43
import org.gvsig.graph.core.NetworkUtils;
44 44

  
45
import com.hardcode.gdbms.engine.values.Value;
45 46
import com.iver.cit.gvsig.fmap.core.IFeature;
46 47
import com.iver.cit.gvsig.fmap.core.IGeometry;
47 48
import com.iver.cit.gvsig.fmap.core.v02.FConverter;
......
171 172
					// Si no, hemos pasado por idStop2 y la parte que hay que meter es desde el pto interior a idStop2
172 173
					///////////////////////////////////////////////////////////////////////////////////////
173 174
//					IFeature feat = va.getFeature(finalEdge.getIdArc());
174
					IFeature feat = featExtractor.getFeature(finalEdge.getIdArc());
175
					IGeometry g = featExtractor.getGeometry(finalEdge.getIdArc());
176
					Value nameStreet = featExtractor.getFieldValue(finalEdge.getIdArc(), getFieldIndexStreetName());
175 177
					
176
					MultiLineString jtsGeom = (MultiLineString) feat.getGeometry().toJTSGeometry();
178
					MultiLineString jtsGeom = (MultiLineString) g.toJTSGeometry();
177 179
			//		CoordinateFilter removeDuplicates = new UniqueCoordinateArrayFilter(); 
178 180
			//		jtsGeom.apply(removeDuplicates);
179 181
			//		jtsGeom.geometryChanged();
......
211 213
						// TODO: Calcular bien el length de este arco, 
212 214
						// basandonos en el porcentaje costeTramoFinal / costeOriginal
213 215
						route.addRouteFeature(geom, origin.getIdArc(), 
214
								costeTramoFinal, line.getLength(), feat.getAttribute(getFieldIndexStreetName()).toString());
216
								costeTramoFinal, line.getLength(), nameStreet.toString());
215 217
			
216 218
			
217 219
						return ; // Deber?a sacar el coste
......
223 225
					pNodo = graph.getNodeByID(idEnd);
224 226
					
225 227
					from_link = pNodo.get_best_from_link();
228
					
229
					long t1 = System.currentTimeMillis();
226 230
			
227 231
					while ((pNodo.getIdNode() != idStart)) 
228 232
					{
......
286 290
						if (pNodo.getIdNode() != idStart)
287 291
							from_link = pNodo.get_from_link(idEnlace);
288 292
					}
293
					long t2 = System.currentTimeMillis();
294
					System.out.println("T populate 1 = " + (t2-t1));
289 295
			
290 296
					// Y ahora recorremos hacia atr?s el vector y escribimos los shapes.
291 297
					// VECTORINFO::iterator theIterator;
292 298
					int auxC = 0;
293 299
					
300
					t1 = System.currentTimeMillis();
301
					
294 302
					while (!pilaShapes.empty())  
295 303
					{
296 304
						infoShp = (InfoShp) pilaShapes.peek();
297
//						feat = va.getFeature(infoShp.idArc);
298
						feat = featExtractor.getFeature(infoShp.idArc);
299
						MultiLineString line = (MultiLineString) feat.getGeometry().toJTSGeometry();
300
			//			line.apply(removeDuplicates);
301
			//			line.geometryChanged();
305
						g = featExtractor.getGeometry(infoShp.idArc);
306
						nameStreet = featExtractor.getFieldValue(infoShp.idArc, getFieldIndexStreetName());
307

  
308
						MultiLineString line = (MultiLineString) g.toJTSGeometry();
302 309
						
303 310
						LineString aux = null;
304 311
						if (infoShp.pct < 1.0)
......
320 327
							geom = FConverter.jts_to_igeometry(aux);
321 328
						}	
322 329
			
323
			
324 330
						route.addRouteFeature(geom, infoShp.idArc, 
325
								infoShp.cost, infoShp.distance, feat.getAttribute(getFieldIndexStreetName()).toString());
331
								infoShp.cost, infoShp.distance, nameStreet.toString());
326 332
			
327 333
			
328 334
						pilaShapes.pop();
329 335
						auxC++;
330 336
						
331 337
					}
332
			
338
					t2 = System.currentTimeMillis();
339
					System.out.println("T populate 2 = " + (t2-t1));
333 340
					return;
334 341
			
335 342
					
trunk/extensions/extGraph/src/org/gvsig/graph/solvers/ShortestPathSolverAStar.java
81 81
				int idStart = net.creaArcosVirtuales(fFrom);
82 82
				int idStop = net.creaArcosVirtuales(fTo);
83 83

  
84
				long tA1= System.currentTimeMillis();
84 85
				double newCost = AStar(idStart, idStop);
85

  
86
				long tA2= System.currentTimeMillis();
87
				System.out.println("T Astar = " + (tA2-tA1));
88
				
86 89
				elCoste1 += newCost;
87 90
				fTo.setCost(elCoste1);
88 91

  
89 92
				if (newCost != Double.MAX_VALUE) {
90 93
					try {
94
						long t1 = System.currentTimeMillis();
91 95
						populateRoute(fFrom, fTo, idStart, idStop);
96
						long t2 = System.currentTimeMillis();
97
						System.out.println("T populateRoute=" + (t2-t1));
92 98
					} catch (BaseException e) {
93 99
						e.printStackTrace();
94 100
						throw new GraphException(e);
trunk/extensions/extGraph/src/org/gvsig/graph/MinimumSpanningTreeExtension.java
130 130
	 */
131 131
	private void calculateMST(MapContext map, Network net, GvFlag[] flags, OneToManySolver solver) throws BaseException {
132 132
		MinimumSpanningTreeExtractor extractor = new MinimumSpanningTreeExtractor(net);
133
		String aux = JOptionPane.showInputDialog("Por favor, introduzca el coste m?ximo de la zona que desea explorar:");
133
		String aux = JOptionPane.showInputDialog(PluginServices.getText(this, "Please_enter_max_cost_MST") + ":");
134 134
		if (aux == null)
135 135
			return;
136 136
		double cost = Double.parseDouble(aux);
trunk/extensions/extGraph/config/text.properties
1
#text.properties
2
Accumulated_distance=Distancia acumulada
3
and=y
4
angle=\u00E1ngulo
1 5
Aplicar_tolerancia_de_snap=Usar tolerancia para crear la topolog\u00EDa de red
2 6
Aplicar_un_CLEAN_sobre_la_capa_original=Corregir topol\u00F3gicamente la capa original
7
Arrival_to=Llegada a
8
Associated_layer=Capa asociada
9
by=por
3 10
Calcular_la_red_sobre_la_capa_original=Calcular la red sobre la capa original
11
Calculate=Calcular
12
Calculate_Service_Areas=Calcular Areas de Servicio
13
cannot_apply_to_a_non_polygon_layer=S\u00F3lo se puede aplicar la leyenda a una capa de pol\u00EDgonos
4 14
center_on_flag=Centrar sobre parada
15
change=cambiar
16
character_marker=Marcador de car\u00E1cter
17
character_marker_symbol=S\u00EDmbolo Marcador de car\u00E1cter
18
choose_marker=Elija marcador
5 19
Clean_de_lineas=Correcci\u00F3n autom\u00E1tica de errores topol\u00F3gicos
6 20
Clean_Test=Clean
7 21
Clear=Borrar
8 22
Clear_Barriers=Quitar todas las barreras
9 23
Clear_Flags=Quitar todas las paradas
10 24
Clear_Routes=Borrar todas las rutas
11
Conversion_de_datos=Conversi\u00F3n de datos
12
Create_Network=Generar topolog\u00EDa de red
13
de=de
14
Defines_a_dot_density_symbol_based_on_a_field_value=Define simbolog\u00EDa de densidad de puntos basada en el valor de un campo determinado
15
Error_ejecucion=Error de ejecuci\u00f3n
16
Error_entrada_datos=Error de entrada de datos
17
Error_entrada_datos=
18
Error_escritura_resultados=Error de escritura de resultados
19
Error_fallo_geoproceso=Se ha producido un fallo durante la ejecuci\u00f3n del geoproceso
20
Error_preparar_escritura_resultados=Se ha producido un error al preparar la capa de resultados
21
Error_seleccionar_resultado=Es necesario especificar un fichero de resultados
22
Especifique_fichero_shp_resultante=Especifique el fichera Shape resultante
23
Fichero_para_capa_corregida=Fichero para la capa corregida
24
Generando_red_a_partir_de_capa_lineal=Generando red a partir de capa lineal
25
Generar_Red==Generar topolog\u00EDa de red
26
Limpiando_lineas=Limpiando l\u00EDneas
27
LineClean=Correcci\u00F3n de errores topol\u00F3gicos en capa lineal
28
LineClean._Progress_Message=Corrigiendo topolog\u00EDa de la capa...
29
Load_Network=Cargar topolog\u00EDa de red previamente generada
30
Load_Red=Cargar fichero de topolog\u00EDa de red por defecto
31
Load_Network_From_File=Cargar red desde fichero...
32
Manage_Flags=Gesti\u00F3n de paradas
33
Network=Red
34
no_se_puede_pasar_por_todas_las_paradas=No se puede pasar por todas las paradas
35
Procesando_linea=Construyendo red
36
Ruta_borrada_o_inexistente=Ruta borrada o inexistente
37
Ruta_no_encontrada=Ruta no encontrada
38
Seleccionar_capa_con_puntos_de_parada=Convertir capa en puntos de parada
39
Seleccione_una_capa_de_puntos_para_crear_paradas=Escoja una capa de puntos para importar paradas
40
Seleccione_un_formato_para_guardar_la_ruta=Seleccione un formato vectorial para guardar la ruta mas reciente.
41
Seleccione_un_formato_para_guardar_los_flags=Seleccione un formato vectorial para guardar las paradas.
42
Shortest_Path=Camino m\u00EDnimo
43
Trabajar_con_las_coordenadas_originales=Trabajar con las coordenadas originales
44
angle=\u00E1ngulo
45
based_upon_the_road_type=
46
cannot_apply_to_a_non_polygon_layer=S\u00F3lo se puede aplicar la leyenda a una capa de pol\u00EDgonos
47
change=cambiar
48
character_marker=Marcador de car\u00E1cter
49
character_marker_symbol=S\u00EDmbolo Marcador de car\u00E1cter
50
choose_marker=Elija marcador
51 25
closest_facility=Proveedor m\u00E1s cercano
26
Closest_Facility=Evento m\u00E1s cercano
52 27
closest_facility_instructions=Instrucciones
53 28
closest_facility_solution=Soluci\u00F3n
54 29
closest_facility_solve=<html><b>Solucionar</b></html>
30
col_arc_type=Tipo de via
31
col_km_per_hour=Km/hora
55 32
color=color
33
compact_area=Area compacta
56 34
confirmation_overwrite=Confirmaci\u00F3n
35
connectivity=Conectividad
36
Connectivity=Conectividad
37
connectivity_analysis=An\u00E1lisis de conectividad
38
continue_by=contin\u00FAe por
39
Conversion_de_datos=Conversi\u00F3n de datos
57 40
cost=coste
58 41
cost_facility_units=<unidades>
59 42
cost_field=campo de coste
60 43
cost_field_text=Cost
61
cost_from_a_table_field=
62 44
cost_units=unidades de coste
63 45
cost_units_text=unidades de coste
64
could_not_find_symbol_directory=
46
costs=costes
65 47
could_not_setup_legend=No se pudo crear la leyenda. Por favor, revise los valores
66 48
create_network=Generar topolog\u00EDa de red
49
Create_Network=Generar topolog\u00EDa de red
50
Create_TIN=Crear Triangulaci\u00F3n (Delaunay)
67 51
criterium=Criterio
52
de=de
53
Defines_a_dot_density_symbol_based_on_a_field_value=Define simbolog\u00EDa de densidad de puntos basada en el valor de un campo determinado
68 54
densities=Densidades
69
digitized_direction=Seg?n se digitaliz?
55
digitized_direction=Seg\u00FAn se digitaliz\u00F3
56
digitizedDirection=Sentido de digitalizaci\u00F3n
70 57
doesnt_exist=no existe
71 58
done=hecho
72 59
dot_density=Densidad de puntos
73 60
dot_size=Tama\u00F1o de punto
74 61
dot_value=Valor del punto
75 62
draw_route=Dibujar la ruta
63
during=durante
76 64
enable=habilitado
65
Error_ejecucion=Error de ejecuci\u00F3n
66
Error_escritura_resultados=Error de escritura de resultados
67
Error_fallo_geoproceso=Se ha producido un fallo durante la ejecuci\u00F3n del geoproceso
77 68
error_message=Error
69
Error_preparar_escritura_resultados=Se ha producido un error al preparar la capa de resultados
70
Error_seleccionar_resultado=Es necesario especificar un fichero de resultados
71
Especifique_fichero_shp_resultante=Especifique el fichera Shape resultante
78 72
event=Evento
79 73
events=Eventos
80 74
explanation_sense_field=<html>1-> Seg\u00FAn est\u00E1 digitalizado<br>2-> inverso<br>3-> Se puede circular en los 2 sentidos)</html>
......
82 76
facilities_loaded_in=Proveedores cargados en
83 77
facility=Proveedor
84 78
feet=pies
79
Fichero_para_capa_corregida=Fichero para la capa corregida
85 80
field_configuration=Configuraci\u00F3n de campos
81
File_Format=Formato de fichero
86 82
fill_color=Color de relleno
87 83
fill_properties=Propiedades de relleno
88 84
flag_amount=N\u00BA de paradas
85
follow=Siga
86
Generando_red_a_partir_de_capa_lineal=Generando red a partir de capa lineal
87
Generar_Red=\=Generar topolog\u00EDa de red
89 88
generate_report=Ver informe de ruta
89
Generated_File=Fichero generado
90 90
grid=Malla
91 91
high=Alta
92 92
hours=horas
......
95 95
la_capa_no_tiene_red_asociada=La capa no tiene ninguna red asociada
96 96
labelling_field=Campo de densidad
97 97
layer=capa
98
Layer_Destinations=Capa de destinos
99
Layer_Origins=Capa de or\u00EDgenes
98 100
layers=Capas
99 101
length_field_text=Length
102
Limpiando_lineas=Limpiando l\u00EDneas
100 103
line_symbols=s\u00EDmbolos de l\u00EDnea
104
LineClean=Correcci\u00F3n de errores topol\u00F3gicos en capa lineal
105
LineClean._Progress_Message=Corrigiendo topolog\u00EDa de la capa...
101 106
load_events=Cargar eventos
107
load_layer_nodes=Cargar capa de nodos
108
Load_Network=Cargar topolog\u00EDa de red previamente generada
109
Load_Network_From_File=Cargar red desde fichero...
110
Load_Red=Cargar fichero de topolog\u00EDa de red por defecto
102 111
load_stages=Cargar paradas
112
Load_TurnCosts=Cargar costes de giro
113
load_velocities=Cargar velocidades
103 114
loading_facilities=Cargando proveedores
104 115
low=Baja
116
Manage_Flags=Gesti\u00F3n de paradas
105 117
marker_fill=Relleno de marcadores
106
max_cost_limit=<html><p>L\u00EDmite m\u00E1ximo</p><p align=\"center\">de coste:</p></html>
118
max_cost_limit=<html><p>L\u00EDmite m\u00E1ximo</p><p align\="center">de coste\:</p></html>
107 119
max_facilities_number_higher_zero=El n\u00FAmero m\u00E1ximo de proveedores debe ser mayor que cero
108 120
medium=Media
109 121
meters=metros
110 122
miles=millas
111
millimeters=
112
minutes=
113
monetary=
114
nautic_miles=
115
net_analyst=
123
Minimum_spanning_tree=Arbol de recubrimiento m\u00EDnimo
124
msg_set_velocities=Por favor, establezca la velocidad para cada tipo de tramo (en Km / hora)
125
Network=Red
116 126
new_flag=Nueva parada
127
no_event_selected=No se ha seleccionado ning\u00FAn evento
117 128
no_events_network=No hay eventos en la red
118
no_event_selected=No se ha seleccionado ning\u00FAn evento
119 129
no_facilities_layer_selected=No se ha seleccionado ninguna capa de proveedores
120 130
no_network_layer=No se ha encontrado ninguna capa de red
121
number_of_facilities_to_search=<html><p>N\u00FAmero de proveedores</p><p align=\"center\">a buscar:</p></html>
131
no_se_puede_pasar_por_todas_las_paradas=No se puede pasar por todas las paradas
132
Normal_direction=Sentido normal
133
number_of_facilities_to_search=<html><p>N\u00FAmero de proveedores</p><p align\="center">a buscar\:</p></html>
134
ODMatrix=Matriz Or\u00EDgenes-Destinos
135
odmatrix_control_panel=Matrices de distancias
122 136
offset=Desplazamiento
123 137
only_points_in_file=El fichero solo debe contener puntos
124 138
only_use_the_selected_points=<html><p>Solo utilizar los</p><p>puntos seleccionados</p></html>
125 139
options=opciones
140
Options=Opciones
141
order_stops=Ordenar paradas
142
Origin_point=Punto or\u00EDgen
126 143
out_of_the_network=fuera de la red
127 144
outline=Borde
128 145
outline_color=Color del borde
129
outline_color=Color del borde
130 146
outline_width=Tama\u00F1o del borde
131
overwrite_selected_file_confirmation=El archivo seleccionado ya existe. ?Desea sobreescribirlo?
147
overwrite_selected_file_confirmation=El archivo seleccionado ya existe. \u00BFDesea sobreescribirlo?
148
Parameters=Par\u00E1metros
149
piloto_de_redes=Piloto de redes
150
Please_enter_max_cost_MST=Por favor, introduzca el coste m\u00E1ximo para calcular el \u00E1rbol de recubrimiento m\u00EDnimo
132 151
point_symbols=S\u00EDmbolos para puntos
133 152
polygon_symbols=S\u00EDmbolos para pol\u00EDgonos
134 153
preview=Previsualizaci\u00F3n
154
Procesando_linea=Construyendo red
135 155
properties=Propiedades
136 156
put_barrier=Establecer tramo prohibido
137 157
put_flag_on_arc=Situar parada encima de tramo
138 158
put_flag_on_node=Situar parada encima de nodo
159
put_turncost=Poner coste de giro
139 160
random=Aleatorio
161
redes=Redes
162
rejected_facilities_out_of_network=proveedores rechazados por estar fuera de la red
140 163
rejected_facility_out_of_network=proveedor rechazado por estar fuera de la red
141
rejected_facilities_out_of_network=proveedores rechazados por estar fuera de la red
142 164
remove_event=Borrar evento
143 165
reset=Limpiar
144
reverseDigitizedDirection=Inverso al digitalizado:
166
return_to_origin=Volver al or\u00EDgen
167
Reverse_direction=Sentido inverso
168
reverseDigitizedDirection=Inverso al digitalizado\:
145 169
route_control_panel=Gestor de paradas
146 170
route_from_the_event=<html><p>Recorrido desde</p><p>el evento</p></html>
171
Route_report=Informe de ruta
147 172
route_to_the_event=<html>Recorrido al evento</html>
173
Ruta_borrada_o_inexistente=Ruta borrada o inexistente
174
Ruta_no_encontrada=Ruta no encontrada
148 175
save=Guardar
149 176
save_error=Error guardando
150 177
save_events=Guardar eventos
151
save_net_file_in=Guardar fichero de topolog?a en: 
178
save_net_file_in=Guardar fichero de topolog\u00EDa en\: 
152 179
save_route=Salvar ruta
153 180
save_stages=Salvar paradas
181
Save_TurnCosts=Guardar costes de giro
182
save_velocities=Guardar velocidades
154 183
seconds=segundos
184
Seleccionar_capa_con_puntos_de_parada=Convertir capa en puntos de parada
185
Seleccione_un_formato_para_guardar_la_ruta=Seleccione un formato vectorial para guardar la ruta mas reciente.
186
Seleccione_un_formato_para_guardar_los_flags=Seleccione un formato vectorial para guardar las paradas.
187
Seleccione_una_capa_de_puntos_para_crear_paradas=Escoja una capa de puntos para importar paradas
155 188
select_length_field=Seleccione el campo de longitud (metros)
156 189
select_route_show_instructions=Seleccione una ruta para mostrar sus instrucciones
157 190
select_route_to_draw=Seleccione la ruta que se mostrar\u00E1 en el mapa
158 191
select_route_to_zoom=Seleccione la ruta que se enfocar\u00E1 en el mapa
159
select_sense_field=Seleccione el campo de sentido:
192
select_sense_field=Seleccione el campo de sentido\:
160 193
select_street_route_field_name=Seleccione el campo para crear el informe de ruta (nombre de v\u00EDa por donde se pasa)
161 194
select_type_field=Seleccione el campo de tipo de v\u00EDa.
162 195
sense_field_text=Direction
163 196
separation=Separaci\u00F3n
164
shape_type_not_yet_supported=
197
Service_Area=Area de Servicio
198
service_area_control_panel=Area de servicio
199
set_source_flag=Fijar el punto de or\u00EDgen
200
set_velocities=Fijar velocidades
201
Shortest_Path=Camino m\u00EDnimo
165 202
shortest_path_not_found=No se ha encontrado ninguna ruta.
166 203
shortestpath=Camino m\u00EDnimo
204
Show_in_map=Mostrar en el mapa
167 205
shp_files=Archivos SHP
168 206
simple_fill=Relleno sencillo
169 207
size=tama\u00F1o
170
solucion_no_valida=Soluci?n no valida
208
solucion_no_valida=Soluci\u00F3n no valida
171 209
stage=parada
172
symbol_library=
210
Start_from=Salida desde
173 211
symbol_property_editor=Editor de propiedades del s\u00EDmbolo
174
symbol_selector=
175 212
table_events_column_description=Descripci\u00F3n
176 213
table_solution_column_cost=Coste
177 214
table_solution_column_description=Descripci\u00F3n
178 215
table_solution_column_facilities_position=N\u00BA de proveedores
179 216
the_file=El fichero
180
tolerance=Tolerancia
181
Topology_Test=Topolog?a
217
tolerance=tolerancia
218
Tolerance=Tolerancia
219
Topology_Test=Topolog\u00EDa
220
Total_length=Distancia total
221
total_route_cost=Coste total de ruta
222
Trabajar_con_las_coordenadas_originales=Trabajar con las coordenadas originales
182 223
Triangulation_Test=Triangulacion
183
total_route_cost=Coste total de ruta
184 224
trying_to_add_a_non_TypeSymbolEditor_panel=Se est\u00E1 intentando a\u00F1adir un panel que no es del tipo TypeSymbolEditor
225
turn=gire a la
185 226
two_panels_with_the_same_name=Dos paneles con el mismo nombre
186 227
type=Tipo
187 228
type_field_text=campo de texto
229
unit_factor=factor de conversi\u00F3n
188 230
units=Unidades
189
unit_factor=factor de conversi?n
190
unknown_longitude_units=
191
unknown_time_units=
192
unknown_units=
193 231
use_line_length=Usar longitud de l\u00EDnea
194
use_symbol=
232
Use_max_cost=Usar coste m\u00E1ximo
233
Use_max_distance=Usar distancia m\u00E1xima
195 234
warning_message=Advertencia
196 235
width=ancho
197 236
yards=yardas
198 237
zoom_route=Zoom a la ruta
199
piloto_de_redes=Piloto de redes
200
redes=Redes
201
msg_set_velocities=Por favor, establezca la velocidad para cada tipo de tramo (en Km / hora)
202
col_arc_type=Tipo de via
203
col_km_per_hour=Km/hora
204
set_velocities=Fijar velocidades
205
Service_Area=Area de Servicio
206
Closest_Facility=Evento m?s cercano
207
ODMatrix=Matriz Or?genes-Destinos
208
Minimum_spanning_tree=Arbol de recubrimiento m?nimo
209
Create_TIN=Crear Triangulaci?n (Delaunay)
trunk/extensions/extGraph/config/text_en_old.properties
1
#text_en_old.properties
2
angle=Angle
1 3
Aplicar_tolerancia_de_snap=Apply snap tolerance
2 4
Aplicar_un_CLEAN_sobre_la_capa_original=CLEAN the original layer
5
based_upon_the_road_type=Based upon the road type
3 6
Calcular_la_red_sobre_la_capa_original=Compute the net over the original layer
7
cannot_apply_to_a_non_polygon_layer=Cannot apply to a non polygon layer
4 8
center_on_flag=Center on flag
9
change=Change
10
character_marker=Character marker
11
character_marker_symbol=Character marker
12
choose_marker=Choose marker
5 13
Clean_de_lineas=Line clean
6 14
Clear=Remove
7 15
Clear_Barriers=Remove all barriers
8 16
Clear_Flags=Remove all flags
9 17
Clear_Routes=Remove all routes
10
Conversion_de_datos=Data conversion
11
create_topology=Create topology
12
de=of
13
Defines_a_dot_density_symbol_based_on_a_field_value=Defines a dot density symbol based on a value of a given field
14
Error_ejecucion=Execution error
15
Error_entrada_datos=Data entry error
16
Error_entrada_datos=Data entry error
17
Error_escritura_resultados=Error writing results
18
Error_fallo_geoproceso=Error in geoprocess execution
19
Error_preparar_escritura_resultados=Error preparing writing of results
20
Error_seleccionar_resultado=You must select a result file layer
21
Especifique_fichero_shp_resultante=Specify a resulting Shape file
22
Fichero_para_capa_corregida=File for corrected layer
23
Generar_Red==Generate topology network
24
Limpiando_lineas=Cleaning lines
25
LineClean=Topology errors correction in lineal vectorial layer.
26
LineClean._Progress_Message=Cleaning topology of layer...
27
Generando_red_a_partir_de_capa_lineal=Create network from layer of lines
28
Procesando_linea=Building network
29
Ruta_borrada_o_inexistente=Route deleted or inexisting
30
Ruta_no_encontrada=Route not found
31
Seleccionar_capa_con_puntos_de_parada=Creating flags from a point layer
32
Seleccione_una_capa_de_puntos_para_crear_paradas=Choose a point layer whose features will be converted in flags
33
Seleccione_un_formato_para_guardar_la_ruta=Choose a format to save the lastest route. 
34
Seleccione_un_formato_para_guardar_los_flags=Choose a format to save flags.
35
Trabajar_con_las_coordenadas_originales=Work with original coordinates
36
angle=Angle
37
based_upon_the_road_type=Based upon the road type
38
cannot_apply_to_a_non_polygon_layer=Cannot apply to a non polygon layer
39
change=Change
40
character_marker=Character marker
41
character_marker_symbol=Character marker
42
choose_marker=Choose marker
43 18
closest_facility=Closest facility
19
Closest_Facility=Closest Facility
44 20
closest_facility_instructions=Instructions
45 21
closest_facility_solution=Solution
46 22
closest_facility_solve=<html><b>Solve</b></html>
23
col_arc_type=Arc Type
24
col_km_per_hour=Km/hour
47 25
color=Color
48 26
confirmation_overwrite=Confirmation
27
Conversion_de_datos=Data conversion
49 28
cost=Cost
50 29
cost_facility_units=<units>
51 30
cost_field=Cost field
......
55 34
cost_units_text=<html>Explicaci\u00F3n cost units</html>
56 35
could_not_find_symbol_directory=Unable to locate the symbol\u0092s library\u0092s source folder
57 36
could_not_setup_legend=Could not setup legend. Please check values.
58
Create_Network=Create topology network
59 37
create_network=Create Network
38
Create_Network=Create topology network
39
Create_TIN=Create TIN
40
create_topology=Create topology
60 41
criterium=Criterium
42
de=of
43
Defines_a_dot_density_symbol_based_on_a_field_value=Defines a dot density symbol based on a value of a given field
61 44
densities=Densities
62 45
digitized_direction=Same digitized direction
63
digitizedDirection=Digitized direction:
46
digitizedDirection=Digitized direction\:
64 47
doesnt_exist=doesn't exist
65 48
done=Done
66 49
dot_density=Dot density
......
68 51
dot_value=Dot value
69 52
draw_route=Draw the route
70 53
enable=Enable
54
Error_ejecucion=Execution error
55
Error_entrada_datos=Data entry error
56
Error_escritura_resultados=Error writing results
57
Error_fallo_geoproceso=Error in geoprocess execution
71 58
error_message=Error
59
Error_preparar_escritura_resultados=Error preparing writing of results
60
Error_seleccionar_resultado=You must select a result file layer
61
Especifique_fichero_shp_resultante=Specify a resulting Shape file
72 62
event=Event
73 63
events=Events
74 64
facilities=Facilities
75 65
facilities_loaded_in=Facilities loaded in
76 66
facility=Facility
77 67
feet=Feet
68
Fichero_para_capa_corregida=File for corrected layer
78 69
field_configuration=Field configuration
79 70
fill_color=Fill color
80
fill_color=Fill color
81 71
fill_properties=Fill properties
82 72
flag_amount=Flag amount
73
Generando_red_a_partir_de_capa_lineal=Create network from layer of lines
74
Generar_Red=\=Generate topology network
83 75
grid=Grid
84 76
high=High
85 77
hours=Hours
86 78
inches=Inches
87 79
invalid_layer=Invalid layer
88
la_capa_no_tiene_red_asociada=
89 80
labelling_field=Labelling field
90 81
layers=Layers
91 82
length_field_text=<html>Explicaci\u00F3n campo longitud</html>
83
Limpiando_lineas=Cleaning lines
92 84
line_symbols=Line Symbols
85
LineClean=Topology errors correction in lineal vectorial layer.
86
LineClean._Progress_Message=Cleaning topology of layer...
87
load_events=Load events
93 88
Load_Network=Load Network
94
Load_Red=Load default network
95 89
Load_Network_From_File=Load network from file...
96
load_events=Load events
90
Load_Red=Load default network
97 91
load_stages=Load stages
98 92
loading_facilities=Loading facilities
99 93
low=Low
100 94
Manage_Flags=Manage Flags (and Velocities)
101 95
marker_fill=Marker fill
102
max_cost_limit=<html><p>Maximum limit</p><p align=\"center\">of cost:</p></html>
96
max_cost_limit=<html><p>Maximum limit</p><p align\="center">of cost\:</p></html>
103 97
max_facilities_number_higher_zero=The maximum number of facilities must be higher than zero
104 98
medium=Medium
105 99
meters=Meters
106 100
miles=Miles
107 101
millimeters=Millimeters
102
Minimum_spanning_tree=Minimum Spanning Tree
108 103
minutes=Minutes
109 104
monetary=Monetary
105
msg_set_velocities=Please, set speeds for each type of arc (Km / hour)
110 106
nautic_miles=Nautic miles
111 107
net_analyst=Net Analyst
112 108
Network=Network
113 109
new_flag=New flag
114
no_events_network=There is no events in the network
115 110
no_event_selected=There is no a selected event
111
no_events_network=There is no events in the network
116 112
no_facilities_layer_selected=There is no a facilities layer selected
117 113
no_network_layer=Network layer not found
118
number_of_facilities_to_search=<html><p>Number of facilities</p><p align=\"center\">to search:</p></html>
114
number_of_facilities_to_search=<html><p>Number of facilities</p><p align\="center">to search\:</p></html>
115
ODMatrix=Origin-Destination Matrix
119 116
offset=Offset
120 117
only_points_in_file=The file should contain only points
121 118
only_use_the_selected_points=<html><p>Only use the</p><p>selected points</p></html>
......
125 122
outline_color=Outline color
126 123
outline_width=Outline width
127 124
overwrite_selected_file_confirmation=Selected file already exists. Do you want to overwrite it?
125
piloto_de_redes=network analyst
128 126
point_symbols=Point symbols
129 127
polygon_symbols=Polygon symbols
130 128
preview=Preview
129
Procesando_linea=Building network
131 130
properties=Properties
132 131
random=Random
133
rejected_facility_out_of_network=rejected facility cause it is out of network
134 132
rejected_facilities_out_of_network=rejected facilities cause they are out of network 
133
rejected_facility_out_of_network=rejected facility cause it is out of network
135 134
remove_event=Remove event
136 135
reset=Reset
137
reverseDigitizedDirection=Reverse digitized direction:
136
reverseDigitizedDirection=Reverse digitized direction\:
138 137
route_control_panel=Route control panel
139 138
route_from_the_event=<html><p>Route from</p><p>the event</p></html>
140 139
route_to_the_event=<html>Route to</p><p>the event</html>
140
Ruta_borrada_o_inexistente=Route deleted or inexisting
141
Ruta_no_encontrada=Route not found
141 142
save=Save
142 143
save_error=Error saving
143 144
save_events=Save events
144
save_net_file_in=Save .net file:
145
save_net_file_in=Save .net file\:
145 146
save_route=Save route
146 147
save_stages=Save stages
147 148
seconds=Seconds
149
Seleccionar_capa_con_puntos_de_parada=Creating flags from a point layer
150
Seleccione_un_formato_para_guardar_la_ruta=Choose a format to save the lastest route. 
151
Seleccione_un_formato_para_guardar_los_flags=Choose a format to save flags.
152
Seleccione_una_capa_de_puntos_para_crear_paradas=Choose a point layer whose features will be converted in flags
148 153
select_length_field=Select length field
149 154
select_route_show_instructions=Select a route to show its instructions
150 155
select_route_to_draw=Select the route to be drawn in the map
151 156
select_route_to_zoom=Select a route to zoom it
152 157
select_sense_field=Select sense field
153
select_street_route_field_name=
154 158
select_type_field=Select type field
155
sense_field_text=<html>For example: FT -> same as digitized direction, TF-> reverse</html>
159
sense_field_text=<html>For example\: FT -> same as digitized direction, TF-> reverse</html>
156 160
separation=Separation
161
Service_Area=Service Area
162
set_velocities=Set speeds
157 163
shape_type_not_yet_supported=Shape type not yet supported
158 164
Shortest_Path=Shortest path
159 165
shortest_path_not_found=Shortest path not found
......
171 177
the_file=The file
172 178
tolerance=Tolerance
173 179
total_route_cost=Total route cost
180
Trabajar_con_las_coordenadas_originales=Work with original coordinates
174 181
trying_to_add_a_non_TypeSymbolEditor_panel=Attempting to add a non TypeSymbolEditor panel
175 182
two_panels_with_the_same_name=Two panels with the same name
176 183
type=Type
177 184
type_field_text=type text field
178
units=Units
179 185
unit_factor=Unit factor
186
units=Units
180 187
unknown_longitude_units=Unknown longitude units
181 188
unknown_time_units=Unknown time units
182 189
unknown_units=Unkown units
......
186 193
width=Width
187 194
yards=Yards
188 195
zoom_route=Zoom the route
189
piloto_de_redes=network analyst
190
msg_set_velocities=Please, set speeds for each type of arc (Km / hour)
191
col_arc_type=Arc Type
192
col_km_per_hour=Km/hour
193
set_velocities=Set speeds
194
Service_Area=Service Area
195
Closest_Facility=Closest Facility
196
ODMatrix=Origin-Destination Matrix
197
Minimum_spanning_tree=Minimum Spanning Tree
198
Create_TIN=Create TIN
199

  
trunk/extensions/extGraph/config/text_en.properties
1 1
#text_en.properties
2
Accumulated_distance=Accumulated distance
3
and=and
2 4
angle=Angle
3 5
Aplicar_tolerancia_de_snap=Apply snap tolerance
4 6
Aplicar_un_CLEAN_sobre_la_capa_original=CLEAN the original layer
7
Arrival_to=Arrival to
8
Associated_layer=Associated layer
5 9
based_upon_the_road_type=Based upon the road type
10
by=by
6 11
Calcular_la_red_sobre_la_capa_original=Compute the net over the original layer
12
Calculate=Calculate
13
Calculate_Service_Areas=Calculate Service Areas
7 14
cannot_apply_to_a_non_polygon_layer=Cannot apply to a non polygon layer
8 15
center_on_flag=Center on flag
9 16
change=Change
......
19 26
col_arc_type=Arc Type
20 27
col_km_per_hour=km/hour
21 28
color=Color
29
compact_area=Compact area
30
connectivity=Connectivity
31
Connectivity=Connectivity
32
connectivity_analysis=Connectivity analysis
33
continue_by=continue by
22 34
Conversion_de_datos=Data conversion
23 35
cost=Cost
24 36
cost_field=Cost field
......
26 38
cost_from_a_table_field=Compute cost from a table\u00B4s field
27 39
cost_units=Cost units
28 40
cost_units_text=<html>cost units</html>
41
costs=costs
29 42
could_not_find_symbol_directory=Unable to locate the symbols library source folder
30 43
could_not_setup_legend=Could not setup legend. Please check values.
31 44
create_network=Create Network
......
34 47
de=of
35 48
Defines_a_dot_density_symbol_based_on_a_field_value=Defines a dot density symbol based on a value of a given field
36 49
densities=Densities
50
digitizedDirection=Digitized direction
37 51
done=Done
38 52
dot_density=Dot density
39 53
dot_size=Dot size
40 54
dot_value=Dot value
55
during=during
41 56
enable=Enable
42 57
Error_ejecucion=Execution error
43 58
Error_entrada_datos=Data entry error
......
50 65
feet=Feet
51 66
Fichero_para_capa_corregida=File for corrected layer
52 67
field_configuration=Field configuration
68
File_Format=File Format
53 69
fill_color=Fill color
54 70
fill_properties=Fill properties
55 71
flag_amount=Flag amount
72
follow=Follow
56 73
Generando_red_a_partir_de_capa_lineal=Create network from layer of lines
57 74
Generar_Red=\=Generate net topology
58 75
generate_report=See the route information
76
Generated_File=Generated File
59 77
grid=Grid
60 78
high=High
61 79
hours=Hours
......
64 82
la_capa_no_tiene_red_asociada=The layer has no association to the net
65 83
labelling_field=Labelling field
66 84
layer=Layer
85
Layer_Destinations=Layer Destinations
86
Layer_Origins=Layer Origins
67 87
layers=Layers
68 88
length_field_text=<html>Length field text</html>
69 89
Limpiando_lineas=Cleaning lines
70 90
line_symbols=Line Symbols
71 91
LineClean=Topology errors correction in lineal vectorial layer.
72 92
LineClean._Progress_Message=Cleaning topology of layer...
93
load_layer_nodes=Load node layer
73 94
Load_Network=Load topology from previous generated net
74 95
Load_Red=Load data from previous calculated topology 
75 96
load_stages=Load stages
97
Load_TurnCosts=Load turn costs
98
load_velocities=Load velocities
76 99
low=Low
77 100
Manage_Flags=Manage flags
78 101
marker_fill=Marker fill
......
88 111
Network=Network
89 112
new_flag=New flag
90 113
no_se_puede_pasar_por_todas_las_paradas=Not possible to pass all the stops
114
Normal_direction=Normal direction
115
odmatrix_control_panel=Origin-Destination Matrix
91 116
offset=Offset
92 117
options=Options
118
Options=Options
119
order_stops=Order Stops
120
Origin_point=Origin point
93 121
outline=Outline
94 122
outline_color=Outline color
95 123
outline_width=Outline width
124
Parameters=Parameters
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff