Revision 257 2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/extension/View3DManager.java

View differences:

View3DManager.java
21 21
 */
22 22
package org.gvsig.gvsig3d.app.extension;
23 23

  
24
import java.text.DateFormat;
25
import java.util.Date;
26

  
24 27
import javax.swing.ImageIcon;
25 28

  
26 29
import org.gvsig.andami.PluginServices;
......
35 38
import org.gvsig.app.project.documents.gui.WindowLayout;
36 39
import org.gvsig.app.project.documents.view.DefaultViewDocument;
37 40
import org.gvsig.app.project.documents.view.gui.ViewProperties;
41
import org.gvsig.fmap.mapcontext.MapContext;
38 42
import org.gvsig.fmap.mapcontext.ViewPort;
39 43
import org.gvsig.fmap.mapcontext.layers.FLayers;
44
import org.gvsig.gvsig3d.Gvsig3DException;
40 45
import org.gvsig.gvsig3d.Gvsig3DLocator;
41 46
import org.gvsig.gvsig3d.Gvsig3DManager;
47
import org.gvsig.gvsig3d.map3d.layers.FLayers3D;
42 48
import org.gvsig.osgvp.exceptions.node.NodeException;
43 49
import org.gvsig.osgvp.terrain.Extent;
44 50
import org.gvsig.osgvp.terrain.JavaDataDriver;
......
64 70
	public static String TYPENAME = "project.document.view3d";
65 71
	private DynStruct persistenceDefinition;
66 72

  
67
	private IViewerContainer _canvas3d = null;
68
	private TerrainViewer _terrainViewer = null;
69 73

  
70
	private Terrain _terrain = null;
71
	private JavaDataDriver _terrainDataManager = null;
72
	private LayerManager _terrainLayerManager = null;
73
	private int _terrainType = Terrain.CoordinateSystemType.PROJECTED; // spheric
74

  
75
	// or
76
	// plane
77

  
78
	// private Terrain _terrain = null;
79
	// //private ProjectCamera _projectCamera = null;
80
	// private JavaDataDriver _terrainDataManager = null;
81
	// private LayerManager _terrainLayerManager = null;
82
	// private int _terrainType = Terrain.CoordinateSystemType.PROJECTED; //
83
	// spheric
84
	// // or
85
	// // plane
86

  
87 74
	public View3DManager() {
88 75
		// Do nothing
89 76
	}
......
110 97

  
111 98
	public AbstractDocument createDocument() {
112 99

  
113
		String viewName = "";
100
		String viewName = "Vista3D";
114 101
		String aux = PluginServices.getText(this, "untitled");
102
		Gvsig3DManager manager = Gvsig3DLocator.getManager();
115 103
//		int numViews = ((Integer) AbstractDocument.NUMS.get(_registerName))
116 104
//				.intValue();
117 105
//
......
121 109
		
122 110
		DefaultView3DDocument viewDocument = new DefaultView3DDocument(this);
123 111
		
124
//		if(viewDocument != null)
125
//			viewDocument.setProject(project);
126
//		
112
		try {
113
			ViewPort vp = manager.createDefaultViewPort3DInstance();
114
			FLayers3D layers = manager.createDefaultFLayers3DInstance(vp);
115
			viewDocument.setMapContext(layers.getMapContext());
116
			viewDocument.setMapOverViewContext(new MapContext(null));
117
			viewDocument.getMapOverViewContext().setProjection(
118
					viewDocument.getMapContext().getProjection());
119
			viewDocument.setName(viewName);
120
			viewDocument.setCreationDate(DateFormat.getInstance().format(new Date()));
121
			
122
		} catch (Gvsig3DException e) {
123
			// TODO Auto-generated catch block
124
			e.printStackTrace();
125
		}
126
		
127 127
		return viewDocument;
128 128
	}
129 129

  
......
132 132
		DefaultView3DPanel view = new DefaultView3DPanel();
133 133
		DefaultView3DDocument viewDoc = (DefaultView3DDocument) doc;
134 134

  
135
		Gvsig3DManager manager = Gvsig3DLocator.getManager();
136

  
137 135
		ViewPort vp = new ViewPort();
138
		FLayers layers = manager.createDefaultFLayers3DInstance(vp);
136
		
139 137

  
140
		viewDoc.setMapContext(layers.getMapContext());
141
		viewDoc.setMapOverViewContext(manager
142
				.createDefaultMapContext3DInstance());
143

  
144 138
		IViewerContainer canvas3d = viewDoc.getOrCreateCanvas3D();
145 139
		view.setCanvas3d(canvas3d);
146

  
147 140
		view.setTerrain(viewDoc.getTerrain());
148 141
		view.setDataManager(viewDoc.getTerrainDataManager());
149 142
		view.setLayerManager(viewDoc.getTerrainLayerManager());

Also available in: Unified diff