Revision 13606

View differences:

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/MapControl.java
143 143

  
144 144
        this.drawer2 = new Drawer2();
145 145
		//Timer para mostrar el redibujado mientras se dibuja
146
		timer = new Timer(360,
146
		timer = new Timer(33,
147 147
				new ActionListener() {
148 148
					public void actionPerformed(ActionEvent e) {
149 149
						MapControl.this.repaint();
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/IClassifiedVectorialLegend.java
82 82
     */
83 83
	public abstract void delSymbol(Object key);
84 84

  
85
	/**
86
	 * Removes <b>oldSymbol</b> from the Legend and substitutes it with the <b>newSymbol</b> 
87
	 * @param oldSymbol
88
	 * @param newSymbol
89
	 */
90
	public abstract void replace(ISymbol oldSymbol, ISymbol newSymbol);
91

  
85 92
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/QuantityByCategoryLegend.java
272 272
		return getClass().getName();
273 273
	}
274 274

  
275
	public void replace(ISymbol oldSymbol, ISymbol newSymbol) {
276
		ISymbol[] symbols;
277
		// look first in the graduated symbol legend
278
		symbols = graduatedSymbol.getSymbols();
279
		
280
		for (int i = 0; i < symbols.length; i++) {
281
			if (symbols[i].equals(oldSymbol)) {
282
				graduatedSymbol.replace(oldSymbol, newSymbol);
283
				return;
284
			}
285
		}
286
		
287
		// if the symbol wasn't found yet, proceed with color ramp
288
		symbols = colorRamp.getSymbols();
289
		
290
		for (int i = 0; i < symbols.length; i++) {
291
			if (symbols[i].equals(oldSymbol)) {
292
				colorRamp.replace(oldSymbol, newSymbol);
293
				return;
294
			}
295
		}
296
		
297
	}
298

  
275 299
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/VectorialUniqueValueLegend.java
44 44
import java.text.ParseException;
45 45
import java.util.ArrayList;
46 46
import java.util.Comparator;
47
import java.util.Iterator;
47 48
import java.util.TreeMap;
48 49

  
49 50
import org.apache.log4j.Logger;
......
277 278
        return defaultSymbol;
278 279
    }
279 280

  
281
    
280 282
	public String getSLDString(String name)	{
281 283
	    try {
282 284

  
......
624 626
	public String getClassName() {
625 627
		return getClass().getName();
626 628
	}
629
	
630
	public void replace(ISymbol oldSymbol, ISymbol newSymbol) {
631
		if (symbols.containsValue(oldSymbol)) {
632
			Iterator it = symbols.keySet().iterator();
633
			while (it.hasNext()) {
634
				Object key = it.next();
635
				if (symbols.get(key).equals(oldSymbol)) {
636
					symbols.remove(key);
637
					symbols.put(key, newSymbol);
638
				}
639

  
640
			}
641
		}
642
	}
627 643
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/styling/PolygonPlacementConstraints.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.10  2007-07-18 06:54:34  jaume
46
* Revision 1.11  2007-09-10 15:47:11  jaume
47
* *** empty log message ***
48
*
49
* Revision 1.10  2007/07/18 06:54:34  jaume
47 50
* continuing with cartographic support
48 51
*
49 52
* Revision 1.9  2007/04/26 11:41:00  jaume
......
92 95
import com.iver.cit.gvsig.fmap.core.FShape;
93 96
import com.iver.cit.gvsig.fmap.core.IGeometry;
94 97
import com.iver.cit.gvsig.fmap.core.v02.FConverter;
98
import com.iver.cit.gvsig.fmap.drivers.IFeatureIterator;
95 99
import com.iver.utiles.XMLEntity;
96 100
import com.vividsolutions.jts.geom.Geometry;
97 101
import com.vividsolutions.jts.geom.Point;
......
257 261
		return xml;
258 262
	}
259 263

  
264
	public void postprocess() {
265
		// TODO Auto-generated method stub
266
		throw new Error("Not yet implemented!");
267
	}
268

  
269
	public void preprocess(IFeatureIterator featIterator) {
270
		// TODO Auto-generated method stub
271
		throw new Error("Not yet implemented!");
272
	}
273

  
260 274
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/styling/LinePlacementConstraints.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.10  2007-05-22 10:05:31  jaume
46
* Revision 1.11  2007-09-10 15:47:11  jaume
47 47
* *** empty log message ***
48 48
*
49
* Revision 1.10  2007/05/22 10:05:31  jaume
50
* *** empty log message ***
51
*
49 52
* Revision 1.9  2007/05/08 08:47:40  jaume
50 53
* *** empty log message ***
51 54
*
......
90 93
import com.iver.cit.gvsig.fmap.core.FShape;
91 94
import com.iver.cit.gvsig.fmap.core.IGeometry;
92 95
import com.iver.cit.gvsig.fmap.core.TextPath;
96
import com.iver.cit.gvsig.fmap.drivers.IFeatureIterator;
93 97
import com.iver.utiles.XMLEntity;
94 98
/**
95 99
 *
......
218 222
		}
219 223
		return tp;
220 224
	}
225
	
226
	public void preprocess(IFeatureIterator featIterator) {
227
		// TODO Auto-generated method stub
228
		throw new Error("Not yet implemented!");
229
	}
230
	
231
	public void postprocess() {
232
		// TODO Auto-generated method stub
233
		throw new Error("Not yet implemented!");
234
	}
221 235
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/styling/IPlacementConstraints.java
43 43
 *
44 44
 * $Id$
45 45
 * $Log$
46
 * Revision 1.10  2007-07-18 06:54:34  jaume
46
 * Revision 1.11  2007-09-10 15:47:11  jaume
47
 * *** empty log message ***
48
 *
49
 * Revision 1.10  2007/07/18 06:54:34  jaume
47 50
 * continuing with cartographic support
48 51
 *
49 52
 * Revision 1.9  2007/04/18 15:35:11  jaume
......
88 91

  
89 92
import com.iver.cit.gvsig.fmap.core.FShape;
90 93
import com.iver.cit.gvsig.fmap.core.IGeometry;
94
import com.iver.cit.gvsig.fmap.drivers.IFeatureIterator;
91 95
import com.iver.utiles.IPersistance;
92 96

  
93 97
/**
......
144 148
	 * Calculates the position where the next label will be placed. Or null
145 149
	 * if the label does not have to be placed.
146 150
	 *
151
	 * @deprecated 03/09/07 (per comprovar utilitat)
147 152
	 * @param geom, the geometry surface
148 153
	 * @param label, the label to be placed
149 154
	 * @param MultiPolygon exclusionZone
......
152 157
	public abstract FShape[] getLocationsFor(IGeometry geom, FShape labelShape,
153 158
			MultiPolygon exclusionZone);
154 159

  
160
	/**
161
	 * @deprecated 03/09/07 (per comprovar utilitat)
162
	 * @param g
163
	 * @param geom
164
	 * @param lc
165
	 * @param exclusionZone
166
	 * @param transform
167
	 */
155 168
	public abstract void placeLabel(Graphics2D g, IGeometry geom,
156 169
		LabelClass lc, MultiPolygon exclusionZone, AffineTransform transform);
157 170

  
......
177 190

  
178 191
	public void setFitInsidePolygon(boolean b);
179 192

  
193
	/**
194
	 * @deprecated 03/09/07 (per comprovar utilitat)
195
	 * @param featIterator
196
	 */
197
	public void preprocess(IFeatureIterator featIterator);
198
	
199
	/**
200
	 * @deprecated 03/09/07 (per comprovar utilitat)
201
	 */
202
	public void postprocess();
203
	
180 204
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/styling/PointPlacementConstraints.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.9  2007-07-18 06:54:34  jaume
46
* Revision 1.10  2007-09-10 15:47:11  jaume
47
* *** empty log message ***
48
*
49
* Revision 1.9  2007/07/18 06:54:34  jaume
47 50
* continuing with cartographic support
48 51
*
49 52
* Revision 1.8  2007/04/18 15:35:11  jaume
......
84 87
import com.iver.cit.gvsig.fmap.core.FPoint2D;
85 88
import com.iver.cit.gvsig.fmap.core.FShape;
86 89
import com.iver.cit.gvsig.fmap.core.IGeometry;
90
import com.iver.cit.gvsig.fmap.drivers.IFeatureIterator;
87 91
import com.iver.utiles.XMLEntity;
88 92
/**
89 93
 *
......
141 145
		return xml;
142 146
	}
143 147

  
148
	public void postprocess() {
149
		// TODO Auto-generated method stub
150
		throw new Error("Not yet implemented!");
151
	}
152

  
153
	public void preprocess(IFeatureIterator featIterator) {
154
		// TODO Auto-generated method stub
155
		throw new Error("Not yet implemented!");
156
	}
157

  
144 158
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/AbstractIntervalLegend.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.10  2007-08-03 09:22:08  jaume
46
* Revision 1.11  2007-09-10 15:47:11  jaume
47
* *** empty log message ***
48
*
49
* Revision 1.10  2007/08/03 09:22:08  jaume
47 50
* refactored class names
48 51
*
49 52
* Revision 1.9  2007/08/02 10:19:03  jvidal
......
82 85

  
83 86
import java.util.ArrayList;
84 87
import java.util.Comparator;
88
import java.util.Iterator;
85 89
import java.util.TreeMap;
86 90

  
87 91
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
......
299 303
		return null;
300 304
	}
301 305

  
302
	public void setIntervalType(int tipoClasificacion) {
303
		intervalType = tipoClasificacion;
306
	public void setIntervalType(int intervalType) {
307
		this.intervalType = intervalType;
304 308
	}
305 309

  
306 310
	/**
......
339 343
		return (String[]) usedFields.toArray(new String[0]);
340 344

  
341 345
	}
346
	
347
	public void replace(ISymbol oldSymbol, ISymbol newSymbol) {
348
		if (symbols.containsValue(oldSymbol)) {
349
			Iterator it = symbols.keySet().iterator();
350
			while (it.hasNext()) {
351
				Object key = it.next();
352
				if (symbols.get(key).equals(oldSymbol)) {
353
					symbols.remove(key);
354
					symbols.put(key, newSymbol);
355
				}
356
			}
357
		}
358
	}
342 359
}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/v02/FConverter.java
222 222
							break;
223 223

  
224 224
						case PathIterator.SEG_CLOSE:
225
//							System.out.println("SEG_CLOSE");
226

  
227 225
							// A?adimos el primer punto para cerrar.
228 226
							Coordinate firstCoord = (Coordinate) arrayCoords.get(0);
229 227
							arrayCoords.add(new Coordinate(firstCoord.x,
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/symbols/MultiShapeSymbol.java
149 149
		setDescription(xml.getStringProperty("desc"));
150 150
		setUnit(xml.getIntProperty("unit"));
151 151
		marker = (IMarkerSymbol) SymbologyFactory.createSymbolFromXML(xml.getChild(0), null);
152
		line = (ILineSymbol) SymbologyFactory.createSymbolFromXML(xml.getChild(0), null);
153
		fill = (IFillSymbol) SymbologyFactory.createSymbolFromXML(xml.getChild(0), null);
152
		line = (ILineSymbol) SymbologyFactory.createSymbolFromXML(xml.getChild(1), null);
153
		fill = (IFillSymbol) SymbologyFactory.createSymbolFromXML(xml.getChild(2), null);
154 154
	}
155 155

  
156 156
	public String getDescription() {
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/symbols/SimpleTextSymbol.java
128 128
		// i ?s prou sospit?s. Mira on m?s es fa ?s d'este s?mbol i comprova
129 129
		// que all? no estiga fent-se tamb? -rot, si ?s aix?, ?s perqu? ac?
130 130
		// est? al reves (i en tots els llocs on es gasta)
131
		g.rotate(rot);
132
		g.drawString(getText(), 0, 0);
131 133
		g.rotate(-rot);
132
		g.drawString(getText(), 0, 0);
133
		g.rotate(rot);
134 134
		g.translate(-p.getX(), -p.getY());
135 135
	}
136 136

  

Also available in: Unified diff