Revision 1850

View differences:

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/legendmanager/panels/FPanelLegendValues.java
224 224
			int idField = -1;
225 225
			String fieldName = (String) m_cboFields.getSelectedItem();
226 226
			System.out.println("Nombre del campo: " + fieldName);
227
			idField = elRs.getFieldIndexByName(fieldName);
227
            idField = elRs.getFieldIndexByName(fieldName);
228
            if (idField == -1)
229
            {       
230
                System.err.println("Campo no reconocido " + fieldName);
231
                return;
232
            } 
233
            
228 234
			m_Renderer.setFieldName(fieldName);
229 235
			long numReg = elRs.getRowCount();
230 236
			
231
			if (idField == -1)
232
			{		
233
				System.err.println("Campo no reconocido " + fieldName);
234
				return;
235
			}
236 237
			
237 238
			m_symbolTable.removeAllItems();
238 239
			int numSymbols = 0;
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/DEMO/ComandosListener.java
59 59
import java.io.File;
60 60
import java.io.FileNotFoundException;
61 61
import java.io.IOException;
62
import java.net.MalformedURLException;
62 63

  
63 64
import javax.swing.JDialog;
64 65

  
66
import org.apache.batik.swing.JSVGCanvas;
65 67
import org.cresques.cts.IProjection;
66 68
import org.cresques.cts.ProjectionPool;
67 69
import org.geotools.data.DataSourceException;
......
72 74
import org.geotools.styling.Style;
73 75
import org.geotools.styling.StyleBuilder;
74 76

  
75
import com.hardcode.gdbms.engine.data.DBDriver;
77
import com.hardcode.driverManager.Driver;
78
import com.hardcode.driverManager.DriverLoadException;
79
import com.iver.andami.messages.NotificationManager;
76 80
import com.iver.cit.gvsig.fmap.DriverException;
77 81
import com.iver.cit.gvsig.fmap.FMap;
78 82
import com.iver.cit.gvsig.fmap.MapControl;
79 83
import com.iver.cit.gvsig.fmap.ViewPort;
80
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
81 84
import com.iver.cit.gvsig.fmap.drivers.RasterDriver;
82 85
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver;
83 86
import com.iver.cit.gvsig.fmap.layers.CancelationException;
......
85 88
import com.iver.cit.gvsig.fmap.layers.FLyrGT2;
86 89
import com.iver.cit.gvsig.fmap.layers.LayerFactory;
87 90
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
88
import com.iver.cit.gvsig.fmap.layers.XMLException;
89 91
import com.iver.cit.gvsig.fmap.layers.layerOperations.AlphanumericData;
92
import com.iver.cit.gvsig.fmap.rendering.styling.panels.SymbolSelector;
90 93
import com.iver.cit.gvsig.gui.DataBaseOpenDialog;
91 94
import com.iver.cit.gvsig.gui.FOpenDialog;
92 95
import com.iver.cit.gvsig.gui.FPanelLocConfig;
......
189 192
        if (e.getActionCommand() == "ZOOM_PREVIO") {            
190 193
            vp.setPreviousExtent();
191 194
        }
195
        if (e.getActionCommand() == "SYMBOL_MANAGER") {            
196
            JDialog dialog = new JDialog();
197
            /* JSVGCanvas canvas = new JSVGCanvas();
198
            try {
199
                canvas.setURI( new File("D:/java/eclipse30/eclipse/workspace/FMap 03/docs/fill1.svg").toURL().toString() );
200
            } catch (MalformedURLException e1) {
201
                // TODO Auto-generated catch block
202
                e1.printStackTrace();
203
            } */
204
            SymbolSelector canvas = new SymbolSelector();
205

  
206
            dialog.getContentPane().add( canvas );
207

  
208
            dialog.setSize( 600, 300 );
209
            dialog.show( true );
210
            
211
        }
212

  
192 213
        if (e.getActionCommand().indexOf("GT2") != -1 && pruebasGT2 != null) {
193 214
        	pruebasGT2.setMapContext(m_Mapa);
194 215
        	pruebasGT2.actionPerformed(e);
......
244 265
            dlg.setModal(true);
245 266
            FileOpenDialog fileDlg = new FileOpenDialog(new Class[]{VectorialFileDriver.class, RasterDriver.class});
246 267
            DataBaseOpenDialog dbop = new DataBaseOpenDialog();
247
            dbop.setClasses(new Class[]{DBDriver.class});
268
            // dbop.setClasses(new Class[]{DBDriver.class});
248 269
            
249 270
            FOpenDialog fopen = new FOpenDialog();
250 271
            fopen.addTab("Fichero", fileDlg);
......
260 281
    		if (fileDlg.getFiles() == null) return;
261 282
    		FLayer lyr = null;
262 283
    		File[] files = fileDlg.getFiles();
263
    		String[] driverNames = fileDlg.getDriverNames();
284
            String[] driverNames = fileDlg.getDriverNames();
285
            Driver[] drivers = new Driver[driverNames.length];
286
            for (int i = 0; i < drivers.length; i++) {
287
                try {
288
                    drivers[i] = LayerFactory.getDM().getDriver(driverNames[i]);
289
                } catch (DriverLoadException ex) {
290
                    System.err.println("No se pudo cargar el driver " + ex.getMessage());
291
                }
292
            }
293
            
264 294
			m_MapControl.getMapContext()
265 295
			   .beginAtomicEvent();
266 296

  
......
271 301
    			String layerPath = fich.getAbsolutePath();
272 302
    			
273 303
    			try {
274
    				lyr = LayerFactory.createLayer(layerName, driverNames[iFile], fich, proj);
304
                    if (drivers[iFile] instanceof VectorialFileDriver){
305
                        lyr = LayerFactory.createLayer(layerName,
306
                                (VectorialFileDriver) drivers[iFile], fich, proj);
307
                    }else if (drivers[iFile] instanceof RasterDriver){
308
/*                          lyr = LayerFactory.createLayer(layerName,
309
                                driverNames[iFile], fich, proj);
310
*/                  }
275 311

  
276 312
    				lyr.setVisible(true);
277 313
    				lyr.setName(layerName);
......
349 385
					} catch (HeadlessException ex) {
350 386
						// TODO Auto-generated catch block
351 387
						ex.printStackTrace();
352
					} catch (com.hardcode.gdbms.engine.data.DriverException ex) {
353
						// TODO Auto-generated catch block
354
						ex.printStackTrace();
355
					}
388
					} catch (com.hardcode.gdbms.engine.data.driver.DriverException e1) {
389
                        // TODO Auto-generated catch block
390
                        e1.printStackTrace();
391
                    }
356 392

  
357 393
    			}
358 394
    			
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/DEMO/SingleView.java
253 253
    	inPanel.setLayout(new BorderLayout());
254 254
    	
255 255
    	JToolBar tempPanel = new JToolBar();
256

  
257
        JButton  btnSymbolManager = new JButton();
258
        btnSymbolManager.setIcon(new javax.swing.ImageIcon(
259
		        "images/Link.png"));
260
        btnSymbolManager.setActionCommand("SYMBOL_MANAGER");
261
        btnSymbolManager.addActionListener(m_acL);
262
        tempPanel.add(btnSymbolManager);
256 263
    	
264
    	
257 265
        btn_FullExtent.setIcon(new javax.swing.ImageIcon(
258 266
                "images/MapContents.png"));
259 267
        btn_FullExtent.setActionCommand("ZOOM_TODO");
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/DEMO/PruebasGT2.java
155 155
       String dburl = "jdbc:mysql://localhost/test";
156 156
       String dbuser = "root";
157 157
       String dbpass = "aquilina";
158
       String fields = "ASBINARY(ogc_geom) as the_geom, KILOMETERS, RD_11";
158
       // String fields = "ASBINARY(ogc_geom) as the_geom, NOM_PROVIN, ND_4, ND_5, ND_14, AREA";
159
       String fields = "ASBINARY(ogc_geom) as the_geom, RD_11";
159 160
       String whereClause = "";
160 161
       
161 162
       

Also available in: Unified diff