ext3Dgui.patch

Francisco José Peñarrubia, 03/22/2012 11:09 AM

Download (4.86 KB)

View differences:

src/org/gvsig/gvsig3dgui/display/FullScreenPanel.java (working copy)
66 66
import com.iver.andami.ui.mdiManager.IWindow;
67 67
import com.iver.andami.ui.mdiManager.IWindowListener;
68 68
import com.iver.andami.ui.mdiManager.WindowInfo;
69
import com.iver.core.NotificationDialog;
70 69

  
70

  
71 71
public class FullScreenPanel extends GridBagLayoutPanel implements IWindow,
72 72
		ChangeListener, IWindowListener {
73 73

  
src/org/gvsig/gvsig3dgui/view/View3D.java (working copy)
20 20
import javax.swing.JSplitPane;
21 21

  
22 22
import org.cresques.cts.IProjection;
23
import org.gvsig.gvsig3d.listener.canvasListener;
23
import org.gvsig.fmap.swing.toc.TOCLocator;
24 24
import org.gvsig.gvsig3d.map3d.MapContext3D;
25 25
import org.gvsig.gvsig3d.map3d.MapControl3D;
26 26
import org.gvsig.gvsig3d.map3d.ViewPort3D;
......
37 37
import org.gvsig.osgvp.viewer.IViewerContainer;
38 38
import org.gvsig.osgvp.viewer.OSGViewer;
39 39
import org.gvsig.osgvp.viewer.ViewerFactory;
40
import org.gvsig.tools.service.ServiceException;
40 41

  
41 42
import com.iver.ai2.gvsig3d.resources.ResourcesFactory;
42 43
import com.iver.andami.PluginServices;
44
import com.iver.andami.messages.NotificationManager;
43 45
import com.iver.andami.ui.mdiManager.WindowInfo;
44 46
import com.iver.cit.gvsig.fmap.ColorEvent;
45 47
import com.iver.cit.gvsig.fmap.ExtentEvent;
48
import com.iver.cit.gvsig.fmap.MapContext;
49
import com.iver.cit.gvsig.fmap.MapControl.MapToolListener;
46 50
import com.iver.cit.gvsig.fmap.ProjectionEvent;
47 51
import com.iver.cit.gvsig.fmap.ViewPort;
48 52
import com.iver.cit.gvsig.fmap.ViewPortListener;
49
import com.iver.cit.gvsig.fmap.MapControl.MapToolListener;
50 53
import com.iver.cit.gvsig.fmap.crs.CRSFactory;
51 54
import com.iver.cit.gvsig.fmap.tools.Behavior.Behavior;
52 55
import com.iver.cit.gvsig.fmap.tools.Behavior.PointBehavior;
53 56
import com.iver.cit.gvsig.project.documents.view.MapOverview;
54 57
import com.iver.cit.gvsig.project.documents.view.gui.BaseView;
55
import com.iver.cit.gvsig.project.documents.view.toc.gui.TOC;
56 58
import com.iver.cit.gvsig.project.documents.view.toolListeners.InfoListener;
57 59

  
58 60
public class View3D extends BaseView {
......
80 82
	public void setModel(ProjectView3D model) {
81 83
		this.modelo = model;
82 84

  
83
		initComponents();
84

  
85 85
		// Se registra como listener de cambios en FMap
86 86
		MapContext3D fmap = (MapContext3D) modelo.getMapContext();
87 87

  
88
		initComponents(fmap);
89

  
90

  
88 91
		// set projection for 3D view
89 92
		IProjection projection = null;
90 93
		ViewPort vp = null;
......
130 133
		_canvas3d.addMouseWheelListener(mapToolListener);
131 134

  
132 135
		m_MapControl.setMapContext(fmap);
133
		m_TOC.setMapContext(fmap);
136
//		m_TOC.setMapContext(fmap);
134 137
		m_MapControl.setBackground(new Color(255, 255, 255));
135 138
		if (modelo.getMapOverViewContext() != null) {
136 139
			m_MapLoc.setModel(modelo.getMapOverViewContext());
......
172 175
	 * DOCUMENT ME!
173 176
	 */
174 177
	// FALTA CONVERTIR QUE CANVAS3D HAGA EL PAPEL DE m_MapControl
175
	protected void initComponents() { // GEN-BEGIN:initComponents
178
	protected void initComponents(MapContext mapContext) { // GEN-BEGIN:initComponents
176 179
		m_MapControl = new MapControl3D(this); // Default is paintEnabled =
177 180
												// false.
178 181
		// Remember to activate it
179 182
		m_MapControl.addExceptionListener(mapControlExceptionListener);
180
		m_TOC = new TOC();
183
		//m_TOC = new TOC();
184
        try {
185
            m_TOC = TOCLocator.getInstance(
186
    		).getTOCManager().createTOC(mapContext);
187
        } catch (ServiceException se) {
188
        	NotificationManager.addError("While creating TOC. ", se);
189
        }
181 190

  
182 191
		// Ponemos el localizador
183 192
		m_MapLoc = new MapOverview(m_MapControl);
......
187 196
		tempMainSplit.setPreferredSize(new Dimension(500, 300));
188 197
		if (!isPalette()) {
189 198
			JSplitPane tempSplitToc = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
190
			tempSplitToc.setTopComponent(m_TOC);
199
			tempSplitToc.setTopComponent(m_TOC.getComponent());
191 200
			tempSplitToc.setBottomComponent(m_MapLoc);
192 201
			tempSplitToc.setResizeWeight(0.7);
193 202
			tempMainSplit.setLeftComponent(tempSplitToc);
194 203
		} else {
195
			tempMainSplit.setLeftComponent(m_TOC);
204
			tempMainSplit.setLeftComponent(m_TOC.getComponent());
196 205
		}
197
		m_TOC.setVisible(true);
206
		m_TOC.getComponent().setVisible(true);
198 207
		JPanel panel = new JPanel();
199 208
		panel.setLayout(new BorderLayout());
200 209
		panel.add((Component) _canvas3d);
......
284 293

  
285 294
	public void windowActivated() {
286 295
		ViewerFactory.getInstance().addViewerToAnimator(_canvas3d);
287
		getTOC().refresh();
296
		getTOC().getComponent().invalidate();
288 297
		super.windowActivated();
289 298
	}
290 299