Revision 334 2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/gui/styling/SymbolSelector3D.java

View differences:

SymbolSelector3D.java
23 23
import org.gvsig.app.project.documents.view.legend.gui.ISymbolSelector;
24 24
import org.gvsig.fmap.geom.type.GeometryType;
25 25
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
26
import org.gvsig.gvsig3d.impl.symbology3d.marker.impl.NodeMarker3DSymbol;
27
import org.gvsig.gvsig3d.impl.symbology3d.marker.impl.PictureMarker3DSymbol;
26 28
import org.gvsig.gvsig3d.impl.symbology3d.marker.impl.SimpleMarker3DSymbol;
29
import org.gvsig.gvsig3d.symbology3d.I3DSymbol;
27 30
import org.gvsig.gvsig3d.symbology3d.marker.ISimpleMarker3DSymbol;
28 31
import org.gvsig.i18n.Messages;
29 32

  
33
import ucar.nc2.constants._Coordinate;
34

  
30 35
public class SymbolSelector3D extends JPanel implements ISymbolSelector,
31 36
		ActionListener {
32 37
	/**
......
86 91
		_psTab = new PictureSymbolTab(this);
87 92
		_obTab = new Object3DSymbolTab(this);
88 93
		initComponents();
89
		_tabsPane.add(_ssTab);
90
		_activeTab = _ssTab;
94

  
95
		if (symbol.getClass().equals(SimpleMarker3DSymbol.class)) {
96
			_ssTab.updatePanel((I3DSymbol) symbol);
97
			_tabsPane.add(_ssTab);
98
			_activeTab = _ssTab;
99
		} else if (symbol.getClass().equals(PictureMarker3DSymbol.class)) {
100
			_psTab.updatePanel((I3DSymbol) symbol);
101
			_tabsPane.add(_psTab);
102
			_activeTab = _psTab;
103
		} else if (symbol.getClass().equals(NodeMarker3DSymbol.class)) {
104
			_obTab.updatePanel((I3DSymbol) symbol);
105
			_tabsPane.add(_obTab);
106
			_activeTab = _obTab;
107
		}
91 108
		addAcceptCancelButtons();
92 109

  
93 110
	}
......
178 195
		panel.setLayout(new FlowLayout(FlowLayout.RIGHT, 5, 5));
179 196

  
180 197
		btnNewButton = new JButton("Cancel");
198
		btnNewButton.addActionListener(new ActionListener() {
199
			public void actionPerformed(ActionEvent arg0) {
200
				PluginServices.getMDIManager().closeWindow(
201
						SymbolSelector3D.this);
202
			}
203
		});
181 204
		panel.add(btnNewButton);
182 205

  
183 206
		btnNewButton_1 = new JButton("Accept");
......
189 212
					((ISimpleMarker3DSymbol) (_newSymbol))
190 213
							.setGeometry(((ISimpleMarker3DSymbol) (_oldsymbol))
191 214
									.getGeometry());
192
				//setSymbol(_newSymbol);
215
				// setSymbol(_newSymbol);
216

  
193 217
				PluginServices.getMDIManager().closeWindow(
194 218
						SymbolSelector3D.this);
195 219
			}
......
209 233

  
210 234
		if (wi == null) {
211 235
			wi = new WindowInfo(WindowInfo.MODALDIALOG | WindowInfo.RESIZABLE);
212
			wi.setWidth(600);
236
			wi.setWidth(800);
213 237
			wi.setHeight(400);
214 238
			wi.setTitle(Messages.getText("symbol_selector"));
215 239
		}

Also available in: Unified diff