Revision 8207

View differences:

trunk/extensions/extGraph_predes/src/com/iver/cit/gvsig/graph/ShortestPathExtension.java
121 121
			IFeature feat = (IFeature) it.next();
122 122
			IGeometry gAux = feat.getGeometry();
123 123
			FGraphic graphic = new FGraphic(gAux, idSymbolLine);
124
			graphicLayer.addGraphic(graphic);
124
			// Lo insertamos al principio de la lista para que los
125
			// pushpins se dibujen despu?s.
126
			graphicLayer.insertGraphic(0, graphic);
125 127
		}
126 128
		mapControl.drawGraphics();
127 129

  
trunk/extensions/extGraph_predes/src/com/iver/cit/gvsig/graph/TestExtension.java
176 176
			IFeature feat = (IFeature) it.next();
177 177
			IGeometry gAux = feat.getGeometry();
178 178
			FGraphic graphic = new FGraphic(gAux, idSymbolLine);
179
			graphicLayer.addGraphic(graphic);
179
			graphicLayer.insertGraphic(0, graphic);
180 180
		}
181 181
		mapControl.drawGraphics();
182 182

  
......
194 194
			IFeature feat = va.getFeature(edge.getArcID());
195 195
			IGeometry gAux = feat.getGeometry();
196 196
			FGraphic graphic = new FGraphic(gAux, idSymbol);
197
			graphicLayer.addGraphic(graphic);
197
			graphicLayer.insertGraphic(0, graphic);
198 198
		}
199 199
		mapControl.drawGraphics();
200 200

  
trunk/extensions/extGraph_predes/src/com/iver/cit/gvsig/graph/tools/FlagListener.java
42 42

  
43 43
import java.awt.Color;
44 44
import java.awt.Cursor;
45
import java.awt.Image;
45 46
import java.awt.geom.Point2D;
46 47

  
48
import javax.swing.ImageIcon;
47 49
import javax.swing.JOptionPane;
48 50

  
51
import com.iver.andami.plugins.PluginClassLoader;
49 52
import com.iver.cit.gvsig.fmap.MapControl;
50 53
import com.iver.cit.gvsig.fmap.core.FShape;
51 54
import com.iver.cit.gvsig.fmap.core.IGeometry;
......
59 62
import com.iver.cit.gvsig.fmap.tools.BehaviorException;
60 63
import com.iver.cit.gvsig.fmap.tools.Events.PointEvent;
61 64
import com.iver.cit.gvsig.fmap.tools.Listeners.PointListener;
62
import com.iver.cit.gvsig.graph.ShortestPathExtension;
63 65
import com.iver.cit.gvsig.graph.core.GvFlag;
64
import com.iver.cit.gvsig.graph.core.INetSolver;
65 66
import com.iver.cit.gvsig.graph.core.Network;
66 67

  
67 68
public class FlagListener implements PointListener {
......
104 105
					return;
105 106
				}
106 107
				GraphicLayer graphicLayer = mapCtrl.getMapContext().getGraphicsLayer();
107
				if (idSymbolFlag == -1)
108
				 if (idSymbolFlag == -1)
108 109
				{
109 110
					FSymbol simFlag = new FSymbol(FShape.POINT, Color.BLUE);
110
					simFlag.setSize(10);
111
					simFlag.setStyle(FConstant.SYMBOL_STYLE_MARKER_SQUARE);
112
					simFlag.setFill(null);
113
					simFlag.setOutlined(true);
114
					simFlag.setOutlineColor(Color.BLUE);
115
					
111
					simFlag.setSize(24);
112
//					simFlag.setStyle(FConstant.SYMBOL_STYLE_MARKER_SQUARE);
113
//					simFlag.setFill(null);
114
//					simFlag.setOutlined(true);
115
//					simFlag.setOutlineColor(Color.BLUE);
116

  
117
					simFlag.setStyle(FConstant.SYMBOL_STYLE_MARKER_IMAGEN);
118
					ImageIcon icon = new ImageIcon(this.getClass().getClassLoader()
119
					     	.getResource("images/pushpin.png"));
120
					simFlag.setIcon(icon.getImage());
121

  
116 122
					idSymbolFlag = graphicLayer.addSymbol(simFlag);
117 123
				}
118 124
				IGeometry gAux = ShapeFactory.createPoint2D(pReal.getX(), pReal.getY());
trunk/extensions/extGraph_predes/src/com/iver/cit/gvsig/graphtests/TestWriter.java
41 41
package com.iver.cit.gvsig.graphtests;
42 42

  
43 43
import java.io.File;
44
import java.sql.Connection;
45
import java.sql.ResultSet;
46
import java.sql.SQLException;
47
import java.sql.Statement;
44 48

  
45 49
import junit.framework.TestCase;
46 50

  
47 51
import org.cresques.cts.IProjection;
48 52

  
53
import com.hardcode.gdbms.driver.postgresql.PostgreSQLDriver;
49 54
import com.iver.cit.gvsig.fmap.DriverException;
50 55
import com.iver.cit.gvsig.fmap.crs.CRSFactory;
51 56
import com.iver.cit.gvsig.fmap.edition.EditionException;
57
import com.iver.cit.gvsig.fmap.edition.writers.JdbcWriter;
52 58
import com.iver.cit.gvsig.fmap.edition.writers.dbf.DbfWriter;
53 59
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
54 60
import com.iver.cit.gvsig.fmap.layers.LayerFactory;
......
119 125
		File edgeFile = new File("c:/edges.dbf");
120 126
		DbfWriter edgeWriter = new DbfWriter();
121 127
		edgeWriter.setFile(edgeFile);
128
		
129
		// Para postgres:
130
		// primero creamos 2 tablas y luego usamos JdbcWriter para a?adir los campos
131
		// y rellenar las tablas
132
		/* JdbcWriter pgEdgeWriter = new JdbcWriter();
133
		pgEdgeWriter.setCreateTable(true);
134
		pgEdgeWriter.setWriteAll(true);
135
		
136
		JdbcWriter pgNodeWriter = new JdbcWriter();
137
		pgNodeWriter.setCreateTable(true);
138
		pgNodeWriter.setWriteAll(true);
139
		
140
		PostgreSQLDriver pgDriver = new PostgreSQLDriver();
141
		
142
		Connection conn = pgDriver.getConnection("localhost", 5432, "latin1", "postgres", "aquilina");
143
		Statement stCreate = conn.createStatement();
144
		try {
145
			stCreate.execute("DROP TABLE nodes;");
146
		} catch (SQLException e1) {
147
			// Si no existe la tabla, no hay que borrarla.
148
		}
149
		try {
150
			stCreate.execute("DROP TABLE edges;");
151
		} catch (SQLException e1) {
152
			// Si no existe la tabla, no hay que borrarla.
153
		}
122 154

  
155
		stCreate.execute("CREATE TABLE nodes (id int4, x float8, y float8);");
156
		stCreate.execute("CREATE TABLE edges ();");
157
		conn.commit();
158
		conn.setAutoCommit(false);
159

  
160
		
161
		Statement st = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
162
				ResultSet.CONCUR_UPDATABLE);
163
		ResultSet res = st.executeQuery("SELECT nodes.oid, nodes.* FROM nodes;");
164
		if (res.getConcurrency() != ResultSet.CONCUR_UPDATABLE) {
165
			System.err.println("Error: No se puede editar la tabla nodes");
166
			return;
167
		}
168
		// res.moveToInsertRow();
169

  
170
		ResultSet resEdges = st.executeQuery("SELECT edges.oid, edges.* FROM edges;");
171
		pgEdgeWriter.initialize(conn, res);
172
		pgNodeWriter.initialize(conn, resEdges);
173
		
174
		netBuilder.setEdgeWriter(pgEdgeWriter);
175
		netBuilder.setNodeWriter(pgNodeWriter); */
176

  
177

  
123 178
		netBuilder.setEdgeWriter(edgeWriter);
124 179
		netBuilder.setNodeWriter(nodeWriter);
125 180
		
181
		
182
		
126 183
	}
127 184

  
128 185
}

Also available in: Unified diff