Revision 320

View differences:

2.0/trunk/org.gvsig.gvsig3d.app/pom.xml
13 13
	<parent>
14 14
		<groupId>org.gvsig</groupId>
15 15
		<artifactId>org.gvsig.maven.base.extension.pom</artifactId>
16
		<version>1.0.6-SNAPSHOT</version>
16
		<version>1.0.8-SNAPSHOT</version>
17 17
	</parent>
18 18

  
19 19
	<scm>
......
70 70
			<dependency>
71 71
				<groupId>org.gvsig</groupId>
72 72
				<artifactId>org.gvsig.tools.lib</artifactId>
73
				<version>2.1.0-SNAPSHOT</version>
73
				<version>3.0.0-SNAPSHOT</version>
74 74
			</dependency>
75 75
			<dependency>
76 76
				<groupId>org.gvsig</groupId>
2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/gui/styling/SymbolSelector3D.java
24 24
		super();
25 25
		System.out.println("I'M a CHAMPION");
26 26
	}
27
	public SymbolSelector3D(ISymbol symbol)
28
	{
29
		super();
30
		System.out.println("I'M a CHAMPION");
31
	}
27 32
	
33
	
28 34
	public SymbolSelector3D(ISymbol symbol, GeometryType shapeType) {
29 35
		super();
30 36
		System.out.println("I'M a CHAMPION");
31 37
	}
38
	public SymbolSelector3D(String domain, ISymbol symbol, Integer shapeType) {
39
		super();
40
		System.out.println("I'M a CHAMPION");
41
	}
32 42
	public WindowInfo getWindowInfo() {
43
	
33 44
		if (wi == null) {
34 45
			wi = new WindowInfo(WindowInfo.MODALDIALOG | WindowInfo.RESIZABLE);
35 46
			wi.setWidth(706);
2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/extension/View3DManager.java
26 26

  
27 27
import javax.swing.ImageIcon;
28 28

  
29

  
29 30
import org.gvsig.andami.PluginServices;
30 31
import org.gvsig.andami.ui.mdiManager.IWindow;
31 32
import org.gvsig.app.project.DefaultProject;
2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/extension/Gvsig3DExtension.java
22 22
package org.gvsig.gvsig3d.app.extension;
23 23

  
24 24
import org.gvsig.andami.plugins.Extension;
25
import org.gvsig.app.gui.styling.SymbolSelector;
26
import org.gvsig.app.project.documents.view.legend.gui.ISymbolSelector;
25 27
import org.gvsig.app.project.documents.view.legend.gui.ThemeManagerWindow;
28
import org.gvsig.fmap.mapcontext.MapContextLocator;
26 29
import org.gvsig.fmap.mapcontext.layers.FLyrDefault;
27 30
import org.gvsig.fmap.mapcontext.layers.vectorial.FLyrVect;
28 31
import org.gvsig.gui.beans.panelGroup.PanelGroupManager;
......
30 33
import org.gvsig.gvsig3d.app.camera.ProjectCamera;
31 34
import org.gvsig.gvsig3d.app.gui.panels.Raster3DPanel;
32 35
import org.gvsig.gvsig3d.app.gui.panels.Vectorial3DPanel;
36
import org.gvsig.gvsig3d.app.gui.styling.SymbolSelector3D;
33 37
import org.gvsig.gvsig3d.app.gui.toc.Properties3DManager;
34 38
import org.gvsig.gvsig3d.app.tocmenu.TocRefreshLayer;
35 39
import org.gvsig.gvsig3d.app.tocmenu.TocTransparencyPanel;
......
65 69
		exPoint.append("Layer_Refresh", "", new TocRefreshLayer());
66 70
		exPoint.append("Layer_Transparency", " ", new TocTransparencyPanel());
67 71

  
72
		//Register Symbol Selector
73
		SymbolSelector.registerSymbolSelector("project.document.view3d", SymbolSelector3D.class);
74
		
68 75
		// Register other classes persistence with the Caller
69 76
		Caller caller = new DefaultCaller();
70 77

  
2.0/trunk/org.gvsig.gvsig3d/org.gvsig.gvsig3d.lib/org.gvsig.gvsig3d.lib.impl/src/main/java/org/gvsig/gvsig3d/impl/Gvsig3DDefaultImplLibrary.java
57 57

  
58 58
	@Override
59 59
	protected void doPostInitialize() throws LibraryException {
60

  
61 60
		Gvsig3DManager manager = Gvsig3DLocator.getManager();
62 61

  
63 62
		manager.registerDefaultGraphicsLayer3D(GraphicLayer3DImpl.class);
2.0/trunk/org.gvsig.gvsig3d/org.gvsig.gvsig3d.lib/org.gvsig.gvsig3d.lib.impl/src/main/java/org/gvsig/gvsig3d/impl/map3d/MapContext3DImpl.java
779 779
		else if (layer instanceof FLyrVect) {
780 780

  
781 781
			props3D.setType(Layer3DProps.layer3DVector);
782

  
783 782
		}
784 783
		addLayerToTerrain(layer, true);
785 784

  
2.0/trunk/org.gvsig.gvsig3d/org.gvsig.gvsig3d.lib/org.gvsig.gvsig3d.lib.impl/src/main/java/org/gvsig/gvsig3d/impl/map3d/Layer3DPropsImpl.java
274 274

  
275 275
	public void setType(int type) {
276 276
		_type = type;
277

  
277
		//We need to persist in the layer properties if the layer is rasterized or not.
278
		_layer.setProperty("layerType", type);
278 279
	}
279 280

  
280 281
	public void setVerticalEx(float ex) {
2.0/trunk/org.gvsig.gvsig3d.osg/org.gvsig.gvsig3d.osg.io/pom.xml
63 63
            <artifactId>org.gvsig.fmap.geometry</artifactId>
64 64
            <scope>compile</scope>
65 65
        </dependency>
66
        <dependency>
67
            <groupId>org.gvsig</groupId>
68
            <artifactId>org.gvsig.timesupport.lib.api</artifactId>
69
            <scope>compile</scope>
70
        </dependency>
66 71
   		<dependency>
67 72
            <groupId>org.gvsig</groupId>
68 73
            <artifactId>org.gvsig.tools.lib</artifactId>

Also available in: Unified diff