Revision 342

View differences:

2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/gui/styling/PictureSymbolTab.java
69 69
		add(tabbedPane, BorderLayout.CENTER);
70 70

  
71 71
		panel = new JPanel();
72
		tabbedPane.addTab("Properties", null, panel, null);
72
		tabbedPane.addTab("Picture Marker", null, panel, null);
73 73
		GridBagLayout gbl_panel = new GridBagLayout();
74 74
		gbl_panel.columnWidths = new int[] { 175 };
75 75
		gbl_panel.rowHeights = new int[] { 180, 70 };
......
163 163
		panel_3.setLayout(new BorderLayout(0, 0));
164 164

  
165 165
		sizeSpinner = new JSpinner();
166
		sizeSpinner.setModel(new SpinnerNumberModel(1.0, 1.0, 1000.0, 1.0));
166
		sizeSpinner.setModel(new SpinnerNumberModel(32.0, 1.0, 1000.0, 1.0));
167 167
		panel_3.add(sizeSpinner);
168 168
		
169 169
		propertiesPanel.setPreferredSize(new Dimension(80,80));
2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/gui/styling/Object3DSymbolTab.java
52 52
		setLayout(new BorderLayout(0, 0));
53 53

  
54 54
		JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
55
		tabbedPane.setPreferredSize(new Dimension(180,300));
55
		tabbedPane.setPreferredSize(new Dimension(180, 300));
56 56
		add(tabbedPane, BorderLayout.CENTER);
57 57

  
58 58
		JPanel panel = new JPanel();
59
		tabbedPane.addTab("Properties", null, panel, null);
59
		tabbedPane.addTab("Node Marker", null, panel, null);
60 60
		GridBagLayout gbl_panel = new GridBagLayout();
61 61
		gbl_panel.columnWidths = new int[] { 175 };
62 62
		gbl_panel.rowHeights = new int[] { 180, 70 };
......
150 150
		sizeSpinner = new JSpinner();
151 151
		sizeSpinner.setModel(new SpinnerNumberModel(1.0, 1.0, 1000.0, 1.0));
152 152
		panel_3.add(sizeSpinner);
153
		
154
		propertiesPanel.setPreferredSize(new Dimension(80,80));
155 153

  
154
		propertiesPanel.setPreferredSize(new Dimension(80, 80));
155

  
156 156
		JPanel panel_4 = new JPanel();
157 157
		tabbedPane.addTab("Collection", null, panel_4, null);
158 158
		GridBagLayout gbl_panel_4 = new GridBagLayout();
......
264 264
	public void updatePanel(I3DSymbol symbol) {
265 265
		// TODO Auto-generated method stub
266 266
		_nodeURL = ((NodeMarker3DSymbol) symbol).getNodeFileURL();
267
		System.out.println("Setting text" + _nodeURL);
268 267
		textField.setText(_nodeURL);
269
		sizeSpinner.setValue(_symbol.getSize());
268
		sizeSpinner.setValue(((NodeMarker3DSymbol) symbol).getSize());
270 269
		loadFile();
271 270
	}
272 271

  
2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/gui/styling/SymbolSelector3D.java
70 70
	public SymbolSelector3D(ISymbol symbol) {
71 71
		super();
72 72
		_oldsymbol = symbol;
73
		System.out.println("I'M a CHAMPION");
73

  
74 74
	}
75 75

  
76 76
	public SymbolSelector3D(ISymbol symbol, GeometryType shapeType) {
......
81 81
		_tabsPane.add(ssTab);
82 82
		addAcceptCancelButtons();
83 83

  
84
		System.out.println("I'M a CHAMPION");
85 84
	}
86 85

  
87 86
	public SymbolSelector3D(String domain, ISymbol symbol, Integer shapeType) {
......
96 95
			_ssTab.updatePanel((I3DSymbol) symbol);
97 96
			_tabsPane.add(_ssTab, BorderLayout.CENTER);
98 97
			_activeTab = _ssTab;
98
			comboBox.setSelectedIndex(0);
99 99
		} else if (symbol.getClass().equals(PictureMarker3DSymbol.class)) {
100 100
			_psTab.updatePanel((I3DSymbol) symbol);
101 101
			_tabsPane.add(_psTab, BorderLayout.CENTER);
102 102
			_activeTab = _psTab;
103
			comboBox.setSelectedIndex(1);
103 104
		} else if (symbol.getClass().equals(NodeMarker3DSymbol.class)) {
104 105
			_obTab.updatePanel((I3DSymbol) symbol);
105 106
			_tabsPane.add(_obTab, BorderLayout.CENTER);
106 107
			_activeTab = _obTab;
108
			comboBox.setSelectedIndex(2);
107 109
		}
108 110
		addAcceptCancelButtons();
109 111

  
2.0/trunk/org.gvsig.gvsig3d.app/org.gvsig.gvsig3d.app.extension/src/main/java/org/gvsig/gvsig3d/app/gui/styling/SimpleSymbolTab.java
63 63
		add(tabbedPane, BorderLayout.CENTER);
64 64
		
65 65
		JPanel panel = new JPanel();
66
		tabbedPane.addTab("Propeties", null, panel, null);
66
		tabbedPane.addTab("Simple Marker", null, panel, null);
67 67
		GridBagLayout gbl_panel = new GridBagLayout();
68 68
		gbl_panel.columnWidths = new int[] { 175 };
69 69
		gbl_panel.rowHeights = new int[] { 180, 70 };
2.0/trunk/org.gvsig.gvsig3d/org.gvsig.gvsig3d.lib/org.gvsig.gvsig3d.lib.impl/src/main/java/org/gvsig/gvsig3d/impl/symbology3d/marker/impl/NodeMarker3DSymbol.java
1 1
package org.gvsig.gvsig3d.impl.symbology3d.marker.impl;
2 2

  
3 3
import java.awt.Graphics2D;
4
import java.awt.Image;
5
import java.awt.Rectangle;
4 6
import java.awt.geom.AffineTransform;
5 7

  
6
import org.gvsig.fmap.dal.feature.Feature;
7
import org.gvsig.fmap.geom.Geometry;
8
import org.gvsig.tools.task.Cancellable;
8
import javax.swing.ImageIcon;
9 9

  
10
import org.gvsig.compat.print.PrintAttributes;
11
import org.gvsig.fmap.mapcontext.rendering.symbols.SymbolDrawingException;
12
import org.gvsig.gvsig3d.resources.ResourcesFactory;
13

  
10 14
public class NodeMarker3DSymbol extends SimpleMarker3DSymbol {
11 15

  
12 16
	String  _nodeFileName="";
......
22 26
	{
23 27
		return _nodeFileName;
24 28
	}
29
	
30
	public void drawInsideRectangle(Graphics2D g,
31
			AffineTransform scaleInstance, Rectangle r,
32
			PrintAttributes properties) throws SymbolDrawingException {
33
		
34
		String ruta = ResourcesFactory.getResourcePath("3D.png");
35
		ImageIcon icon = new javax.swing.ImageIcon(ruta);
36
		Image img = icon.getImage() ;  
37
	    Image newimg = img.getScaledInstance( 18,18,  java.awt.Image.SCALE_SMOOTH ) ;  
38
		icon = new ImageIcon( newimg );
39

  
40
		g.drawImage(icon.getImage(), 0, 0, null);
41
		
42
		
43
		
44
	}
25 45
}

Also available in: Unified diff