Revision 18954

View differences:

trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/gui/FeatureFactory.java
633 633
	 *            Size of the point (in pixels)
634 634
	 * @return
635 635
	 */
636
	public static Node insertPoints(List points, Vec4 color, float size) {
636
	public static Node insertPointL(List points, Vec4 color, float size) {
637 637
		// Creating point
638 638
		PixelPoint p = new PixelPoint();
639 639

  
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/map3d/MapContext3D.java
32 32
import com.iver.cit.gvsig.fmap.layers.GraphicLayer;
33 33
import com.iver.cit.gvsig.fmap.layers.LayerEvent;
34 34
import com.iver.cit.gvsig.fmap.layers.LayerListener;
35
import com.iver.cit.gvsig.fmap.layers.LegendListener;
35
import com.iver.cit.gvsig.fmap.layers.LegendChangedEvent;
36 36
import com.iver.cit.gvsig.fmap.layers.SelectionEvent;
37 37
import com.iver.cit.gvsig.fmap.layers.SelectionListener;
38 38
import com.iver.cit.gvsig.fmap.layers.SingleLayerIterator;
......
40 40
import com.iver.cit.gvsig.fmap.layers.layerOperations.Classifiable;
41 41
import com.iver.cit.gvsig.fmap.rendering.ILegend;
42 42
import com.iver.cit.gvsig.fmap.rendering.IVectorLegend;
43
import com.iver.cit.gvsig.fmap.rendering.LegendChangedEvent;
43
import com.iver.cit.gvsig.fmap.rendering.LegendListener;
44 44
import com.iver.utiles.XMLEntity;
45 45

  
46 46
import es.upv.ai2.osgvp.Node;
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/cacheservices/FLayerCacheService.java
23 23
import org.gvsig.fmap.raster.layers.FLyrRasterSE;
24 24
import org.gvsig.raster.buffer.BufferFactory;
25 25
import org.gvsig.raster.buffer.RasterBuffer;
26
import org.gvsig.raster.buffer.cache.WriterBufferServer;
26
import org.gvsig.raster.buffer.WriterBufferServer;
27 27
import org.gvsig.raster.dataset.GeoRasterWriter;
28 28
import org.gvsig.raster.dataset.InvalidSetViewException;
29 29
import org.gvsig.raster.dataset.NotSupportedExtensionException;
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/Point3DFeature.java
1 1
package com.iver.ai2.gvsig3d.simbology3D;
2 2

  
3
import org.gvsig.symbology.fmap.symbols.CharacterMarkerSymbol;
4
import org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol;
5

  
3 6
import com.iver.ai2.gvsig3d.simbology3D.geometry3D.Point3DGeometry;
4 7
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.I3DSymbol;
5 8
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.point.CharacterPoint3DSymbol;
......
7 10
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.point.PicturePoint3DSymbol;
8 11
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.point.SimplePoint3DSymbol;
9 12
import com.iver.cit.gvsig.fmap.core.IGeometry;
10
import com.iver.cit.gvsig.fmap.core.symbols.CharacterMarkerSymbol;
11 13
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
12 14
import com.iver.cit.gvsig.fmap.core.symbols.MultiLayerMarkerSymbol;
13
import com.iver.cit.gvsig.fmap.core.symbols.PictureMarkerSymbol;
14 15
import com.iver.cit.gvsig.fmap.core.symbols.SimpleMarkerSymbol;
15 16

  
16 17
import es.upv.ai2.osgvp.Group;
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/point/MultiLayerPoint3DSymbol.java
14 14

  
15 15
import com.iver.ai2.gvsig3d.gui.FeatureFactory;
16 16
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
17
import com.iver.cit.gvsig.fmap.core.SymbologyFactory;
17 18
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
18 19
import com.iver.cit.gvsig.fmap.core.symbols.MultiLayerMarkerSymbol;
20
import com.iver.cit.gvsig.fmap.core.symbols.SymbolDrawingException;
19 21
import com.sun.media.jai.codec.ImageCodec;
20 22
import com.sun.media.jai.codec.ImageEncoder;
21 23
import com.sun.media.jai.codec.PNGEncodeParam;
......
72 74
		AffineTransform at =new AffineTransform();
73 75
		at.scale(10, 10);
74 76
		
75
		sym.drawInsideRectangle(graphics,at ,new Rectangle((int)size,(int)size));
77
		try {
78
			sym.drawInsideRectangle(graphics,at ,new Rectangle((int)size,(int)size));
79
		} catch (SymbolDrawingException e1) {
80
			try {
81
				SymbologyFactory.getWarningSymbol(
82
						SymbolDrawingException.STR_UNSUPPORTED_SET_OF_SETTINGS,
83
						"desc",
84
						SymbolDrawingException.SHAPETYPE_MISMATCH).
85
						drawInsideRectangle(graphics,at ,new Rectangle((int)size,(int)size));
86
			} catch (SymbolDrawingException e) { /* impossible */ }
87
		}
76 88
		
77 89
		String sip = "SymbolTmp.png";
78 90
		File file = new File(sip);
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/point/SimplePoint3DSymbol.java
1 1
package com.iver.ai2.gvsig3d.simbology3D.symbol3D.point;
2 2

  
3
import java.awt.Color;
4
import java.util.ArrayList;
3 5
import java.util.List;
6
import java.util.Map;
4 7

  
5 8
import com.iver.ai2.gvsig3d.gui.FeatureFactory;
6 9
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
10
import com.iver.cit.gvsig.fmap.core.symbols.IFillSymbol;
11
import com.iver.cit.gvsig.fmap.core.symbols.IMarkerSymbol;
7 12
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
8 13

  
9 14
import es.upv.ai2.osgvp.Node;
10 15
import es.upv.ai2.osgvp.Vec3;
11 16
import es.upv.ai2.osgvp.Vec4;
17
import es.upv.ai2.osgvp.features.PixelPoint;
12 18

  
13 19
public class SimplePoint3DSymbol extends Abstract3DSymbol {
14 20

  
21
	// Los tipo puntos tienen q tener una unica instancia de pixel point.
22
	// Podrian tener un hasMap como en el caso del piloto
23
	private static Map<Double, PixelPoint> pointsMap;
24
	private Vec4 rgba;
25
	private double size;
26

  
15 27
	public SimplePoint3DSymbol(ISymbol symbol) {
16 28
		super(symbol);
29
		IMarkerSymbol marketSymbol = (IMarkerSymbol) symbol;
30
		
31
		// Symbol color and alpha value
32
		Color color = marketSymbol.getColor();
33
		rgba = new Vec4(color.getRed() / 255f, color.getGreen() / 255f, color
34
				.getBlue() / 255f, color.getAlpha());
35
		
36
		size = marketSymbol.getSize();
37
		
38
		
17 39
	}
18 40

  
19 41
	@Override
20 42
	public Node generateSymbol(List<Vec3> position) {
21 43
		// TODO Auto-generated method stub
22
		return FeatureFactory.generateQuadPoligon(position.get(0),new Vec4(1.0,0.0,0.0,1.0),null,400);
44
		// return FeatureFactory.generateQuadPoligon(position.get(0),new
45
		// Vec4(1.0,0.0,0.0,1.0),null,400);
46
		Node node = FeatureFactory.insertPointL(position, rgba,(int) size);
47
		Vec3 newPosition = new Vec3(0,0,0);
48
		FeatureFactory.addPointToNode(node,newPosition,rgba,(int)size);
49
		return node;
23 50
	}
24 51

  
52
	private Node getPointNode(double key) {
53
		PixelPoint pixelPoint= null;
54

  
55
		if (pointsMap.containsKey(new Double(key))) {
56
			// System.out.println("ya contiene esa key");
57
			pixelPoint = pointsMap.get(new Double(key));
58
		} else {
59
			pixelPoint = new PixelPoint();
60
			pointsMap.put(new Double(key), pixelPoint);
61
		}
62

  
63
		return pixelPoint;
64
	}
65

  
25 66
}
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/point/PicturePoint3DSymbol.java
2 2

  
3 3
import java.util.List;
4 4

  
5
import org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol;
6

  
5 7
import com.iver.ai2.gvsig3d.gui.FeatureFactory;
6 8
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
7 9
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
8
import com.iver.cit.gvsig.fmap.core.symbols.PictureMarkerSymbol;
9 10

  
10 11
import es.upv.ai2.osgvp.Node;
11 12
import es.upv.ai2.osgvp.Vec3;
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/point/CharacterPoint3DSymbol.java
12 12
import java.io.IOException;
13 13
import java.util.List;
14 14

  
15
import org.gvsig.symbology.fmap.symbols.CharacterMarkerSymbol;
16

  
15 17
import com.iver.ai2.gvsig3d.gui.FeatureFactory;
16 18
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
17
import com.iver.cit.gvsig.fmap.core.symbols.CharacterMarkerSymbol;
19
import com.iver.cit.gvsig.fmap.core.SymbologyFactory;
18 20
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
21
import com.iver.cit.gvsig.fmap.core.symbols.SymbolDrawingException;
19 22
import com.sun.media.jai.codec.ImageCodec;
20 23
import com.sun.media.jai.codec.ImageEncoder;
21 24
import com.sun.media.jai.codec.PNGEncodeParam;
......
72 75
		AffineTransform at =new AffineTransform();
73 76
		at.scale(10, 10);
74 77
		
75
		sym.drawInsideRectangle(graphics,at ,new Rectangle((int)size,(int)size));
78
		try {
79
			sym.drawInsideRectangle(graphics,at ,new Rectangle((int)size,(int)size));
80
		} catch (SymbolDrawingException e1) {
81
			try {
82
				SymbologyFactory.getWarningSymbol(
83
						SymbolDrawingException.STR_UNSUPPORTED_SET_OF_SETTINGS,
84
						"desc",
85
						SymbolDrawingException.SHAPETYPE_MISMATCH).
86
						drawInsideRectangle(graphics,at ,new Rectangle((int)size,(int)size));
87
			} catch (SymbolDrawingException e) { /* impossible */ }
88
		}
76 89
		
77 90
		String sip = "SymbolTmp.png";
78 91
		File file = new File(sip);
trunk/libraries/lib3DMap/.classpath
30 30
	<classpathentry kind="lib" path="lib/libosgvp-manipulator-2.0-SNAPSHOT.jar"/>
31 31
	<classpathentry kind="lib" path="lib/libosgvp-planets-2.0-SNAPSHOT.jar"/>
32 32
	<classpathentry kind="lib" path="lib/libosgvp-viewer-2.0-SNAPSHOT.jar"/>
33
	<classpathentry kind="lib" path="/libFMap/lib/org.gvsig.symbology-ext.jar"/>
33 34
	<classpathentry kind="output" path="bin"/>
34 35
</classpath>

Also available in: Unified diff