Revision 124

View differences:

org.gvsig.networkanalysis/trunk/org.gvsig.networkanalysis/org.gvsig.networkanalysis.lib/org.gvsig.networkanalysis.lib.api/src/main/java/org/gvsig/networkanalysis/lib/api/NetworkAnalysisManager.java
31 31
import org.gvsig.fmap.mapcontrol.MapControl;
32 32
import org.gvsig.fmap.mapcontrol.tools.Listeners.PointListener;
33 33
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.Flag;
34
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GenerateFileNetworkTopologyService.GenerateFileNetworkTopologyParameters;
34 35
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GenerateNetworkTopologyParameters;
35 36
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GenerateNetworkTopologyService;
36 37
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GraphException;
......
55 56
	 * @return parameters
56 57
	 */
57 58
    public GenerateNetworkTopologyParameters createGenerateNetworkTopologyParameters();
59
    
60
    /**
61
     * Create File Network Topology Parameters to can create service.
62
     * @return parameters
63
     */
64
    public GenerateFileNetworkTopologyParameters createGenerateFileNetworkTopologyParameters();
58 65

  
59 66
    /**
60 67
     * Create Network Topology Service.
......
123 130
	 * @return file
124 131
	 */
125 132
	public File getNetworkFile(FeatureStore fs);
133
	
134
	/**
135
	 * Get network file by name
136
	 * @param name Name of network file
137
	 * @return file
138
	 */
139
	public File getNetworkFile(String name);
126 140

  
127 141
	/**
128 142
	 * Create network by file, layer and field street name.
org.gvsig.networkanalysis/trunk/org.gvsig.networkanalysis/org.gvsig.networkanalysis.lib/org.gvsig.networkanalysis.lib.impl/src/main/java/org/gvsig/networkanalysis/lib/impl/DefaultNetworkAnalysisManager.java
66 66
import org.gvsig.networkanalysis.lib.api.Route;
67 67
import org.gvsig.networkanalysis.lib.api.Stage;
68 68
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.Flag;
69
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GenerateFileNetworkTopologyService.GenerateFileNetworkTopologyParameters;
69 70
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GenerateNetworkTopologyParameters;
70 71
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GenerateNetworkTopologyService;
71 72
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GraphException;
......
122 123
    public GenerateNetworkTopologyParameters createGenerateNetworkTopologyParameters() {
123 124
        return new DefaultGenerateFileNetworkTopologyParameters();
124 125
    }
126
    
127
    public GenerateFileNetworkTopologyParameters createGenerateFileNetworkTopologyParameters() {
128
        return new DefaultGenerateFileNetworkTopologyParameters();
129
    }
125 130

  
126 131
    public Route createRoute(Network net, SimpleTaskStatus status) throws GraphException {
127 132
    	Route route = null;
......
285 290

  
286 291
	}
287 292
	
293
	public File getNetworkFile(String name) {
294
	    String directoryName = System.getProperty("java.io.tmpdir");
295
	    String aux = name.concat(".net");
296
	    File newFile = new File(directoryName + File.separator + aux);
297
	    return newFile;
298
    }
299
	
288 300
	public void addGraphicFlag(MapContext mapContext, Flag flag) throws CreateGeometryException {
289 301
	try{
290 302
		URL url = new URL(IconThemeHelper.getImageIcon("pushpin").toString());
org.gvsig.networkanalysis/trunk/org.gvsig.networkanalysis/org.gvsig.networkanalysis.app/org.gvsig.networkanalysis.app.mainplugin/src/main/java/org/gvsig/networkanalysis/app/mainplugin/GenerateNetworkAnalysisExtension.java
23 23
package org.gvsig.networkanalysis.app.mainplugin;
24 24

  
25 25
import java.awt.Component;
26
import java.io.File;
26 27

  
28
import javax.swing.JFileChooser;
27 29
import javax.swing.JOptionPane;
30
import javax.swing.filechooser.FileNameExtensionFilter;
28 31

  
32
import org.apache.commons.lang.StringUtils;
33

  
29 34
import org.gvsig.andami.IconThemeHelper;
30 35
import org.gvsig.andami.PluginServices;
31 36
import org.gvsig.andami.plugins.Extension;
......
45 50
import org.gvsig.networkanalysis.lib.api.NetworkAnalysisLocator;
46 51
import org.gvsig.networkanalysis.lib.api.NetworkAnalysisManager;
47 52
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GenerateFileNetworkTopologyService.GenerateFileNetworkTopologyParameters;
48
//import org.gvsig.geoprocess.algorithm.linesnap.LineSnapAlgorithm;
49
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GenerateNetworkTopologyParameters;
50 53
import org.gvsig.networkanalysis.lib.api.generatenetworktopology.GenerateNetworkTopologyService;
51 54
import org.gvsig.networkanalysis.swing.api.NetworkAnalysisSwingLocator;
52 55
import org.gvsig.networkanalysis.swing.api.NetworkAnalysisSwingManager;
......
57 60
import org.gvsig.tools.i18n.I18nManager;
58 61
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
59 62

  
60
//import es.unex.sextante.core.ParametersSet;
61
//import es.unex.sextante.dataObjects.IVectorLayer;
62
//import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
63
//import es.unex.sextante.exceptions.RepeatedParameterNameException;
64

  
65 63
/**
66 64
 * Extension to create Network analysis.
67 65
 * 
......
96 94
        final WindowManager windowManager = new ToolsWindowManager();
97 95
        final NetworkAnalysisSwingManager managerSwing = NetworkAnalysisSwingLocator.getSwingManager();
98 96
        
99
        final GenerateNetworkTopologyParameters parameters = manager.createGenerateNetworkTopologyParameters();
97
        final GenerateFileNetworkTopologyParameters parameters = manager.createGenerateFileNetworkTopologyParameters();
100 98
        ViewDocument view = (ViewDocument) application.getActiveDocument(ViewDocument.class);
101 99
        if( view == null ) {
102 100
            return;
......
111 109
        
112 110
        parameters.setFeatureStore(layer.getFeatureStore());
113 111
        
112
        JFileChooser networkJFileChooser = new JFileChooser();
113
        FileNameExtensionFilter filter = new FileNameExtensionFilter(
114
            "Network files", "net");
115
        networkJFileChooser.setFileFilter(filter);
116
        networkJFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
117
        networkJFileChooser.setDialogTitle(i18nManager.getTranslation("select_destination_file"));
118
        
119
        String userHome = System.getProperty("user.home");
120
        if( StringUtils.isNotBlank(userHome)) {
121
            networkJFileChooser.setCurrentDirectory(new File(userHome));
122
        } 
123
        
124
        int returnValue = networkJFileChooser.showOpenDialog(null);
125
        if( returnValue != JFileChooser.APPROVE_OPTION) {
126
           return; 
127
        }
128
        
129
        // Add .net extension if selected file does not ends with .net 
130
        File selectedFile = networkJFileChooser.getSelectedFile();
131
        String selectedFilePath = selectedFile.getAbsolutePath();
132
        if (!selectedFile.getAbsolutePath().endsWith(".net")) {
133
           selectedFile = new File(selectedFilePath.concat(".net")); 
134
        }
135
        parameters.setNetworkFile(selectedFile);
136
        
114 137
        final GenerateNetworkTopologyWizard wizard = managerSwing.createGenerateNetworkTopologyWizard();
115 138
        wizard.setParameters(parameters);
116
        windowManager.showWindow(
139
        /*windowManager.showWindow(
117 140
                wizard.asJComponent(),
118 141
                i18nManager.getTranslation("_generate_network_topology"),
119 142
                WindowManager.MODE.DIALOG
120 143
        );
121 144
        if (wizard.isCanceled()) {
122 145
            return;
123
        }
146
        }*/
124 147
        final ProgressDialog progressDialog = managerSwing.createProgressDialog();
125 148
        windowManager.showWindow(
126 149
                progressDialog.asJComponent(),
org.gvsig.networkanalysis/trunk/org.gvsig.networkanalysis/org.gvsig.networkanalysis.app/org.gvsig.networkanalysis.app.mainplugin/src/main/resources-plugin/i18n/text_de.properties
117 117
Seleccione_un_formato_para_guardar_la_ruta=Format w\u00E4hlen, indem die letzte Route gespeichert wird.
118 118
Seleccione_un_formato_para_guardar_los_flags=Format w\u00E4hlen, indem die Haltepunkte gespeichert werden.
119 119
Seleccione_una_capa_de_puntos_para_crear_paradas=Layer w\u00E4hlen, f\u00FCr den die Haltepunkte importiert werden.
120
select_destination_file=W\u00E4hlen Sie das Ziel der Topologie-Datei
120 121
select_length_field=W\u00E4hle das Feld f\u00FCr die L\u00E4nge aus (in Meter)
121 122
select_sense_field=W\u00E4hle Richtung
122 123
select_street_route_field_name=W\u00E4hle das Feld aus, f\u00FCr das die Routen-Information erstellt wird (z.B. Name der Strasse, die passiert wird)
org.gvsig.networkanalysis/trunk/org.gvsig.networkanalysis/org.gvsig.networkanalysis.app/org.gvsig.networkanalysis.app.mainplugin/src/main/resources-plugin/i18n/text.properties
211 211
Seleccione_un_formato_para_guardar_la_ruta=Seleccione un formato vectorial para guardar la ruta mas reciente.
212 212
Seleccione_un_formato_para_guardar_los_flags=Seleccione un formato vectorial para guardar las paradas.
213 213
Seleccione_una_capa_de_puntos_para_crear_paradas=Escoja una capa de puntos para importar paradas
214
select_destination_file=Seleccione el destino del fichero de topolog\u00EDa
214 215
select_length_field=Seleccione el campo de longitud (metros)
215 216
select_route_show_instructions=Seleccione una ruta para mostrar sus instrucciones
216 217
select_route_to_draw=Seleccione la ruta que se mostrar? en el mapa
org.gvsig.networkanalysis/trunk/org.gvsig.networkanalysis/org.gvsig.networkanalysis.app/org.gvsig.networkanalysis.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
219 219
Seleccione_un_formato_para_guardar_la_ruta=Choose a format to save the lastest route. 
220 220
Seleccione_un_formato_para_guardar_los_flags=Choose a format to save flags.
221 221
Seleccione_una_capa_de_puntos_para_crear_paradas=Choose a point layer whose features will be converted in flags
222
select_destination_file=Select topology file destination
222 223
select_length_field=Select length field
223 224
select_route_show_instructions=Select a route to show its instructions
224 225
select_route_to_draw=Select the route to be drawn in the map

Also available in: Unified diff