Revision 10993

View differences:

trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/styling/CharacterMarker.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.2  2007-03-09 11:25:00  jaume
46
* Revision 1.3  2007-03-30 12:54:11  jaume
47
* *** empty log message ***
48
*
49
* Revision 1.2  2007/03/09 11:25:00  jaume
47 50
* Advanced symbology (start committing)
48 51
*
49 52
* Revision 1.1.2.7  2007/02/21 07:35:14  jaume
......
189 192
					pnl.setBackground(bgColor);
190 193
					SymbolPreviewer sp = new SymbolPreviewer();
191 194
					sp.setAlignmentX(Component.CENTER_ALIGNMENT);
192
					sp.setPreferredSize(new Dimension(30, 30));
195
					int prevSize = 30;
196
					sp.setPreferredSize(new Dimension(prevSize, prevSize));
193 197
					sp.setSymbol(sym);
194 198
					sp.setBackground(bgColor);
199
					sym.setSize(prevSize*.8);
195 200
					pnl.add(sp);
196 201
					JLabel lbl = new JLabel(sym.getDescription());
197 202
					lbl.setBackground(bgColor);
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/styling/AttrInTableLabeling.java
1 1
package com.iver.cit.gvsig.fmap.rendering.styling;
2 2

  
3
import java.awt.Color;
3 4
import java.awt.Graphics2D;
5
import java.awt.geom.NoninvertibleTransformException;
4 6
import java.awt.image.BufferedImage;
5 7
import java.util.logging.Level;
6 8
import java.util.logging.Logger;
......
91 93
				// limit the labeling to the visible extent
92 94
				FBitSet bs = layer.queryByRect(viewPort.getAdjustedExtent());
93 95

  
94
				ReadableVectorial source = (ReadableVectorial) layer.getSource();
96
				ReadableVectorial source = layer.getSource();
95 97
				SelectableDataSource recordSet = source.getRecordset();
96 98

  
97 99
				for(int i=bs.nextSetBit(0); i>=0; i=bs.nextSetBit(i+1)) {
......
135 137
					IGeometry geom = source.getShape(i);
136 138
					sym.setText(vv[idTextField].toString());
137 139
					sym.setRotation(rotation);
138

  
140
					
139 141
					FLabel[] aux = geom.createLabels(0, true);
140 142
					for (int j = 0; j < aux.length; j++) {
141
						sym.draw(g, viewPort.getAffineTransform(), new FPoint2D(aux[j].getOrig()));
143
						FPoint2D p = new FPoint2D(aux[j].getOrig());
144
						sym.draw(g, viewPort.getAffineTransform(), p);
142 145
					}
143 146

  
144 147
				}
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/symbols/ITextSymbol.java
3 3
import java.awt.Color;
4 4
import java.awt.Font;
5 5
import java.awt.Graphics2D;
6
import java.awt.geom.AffineTransform;
6 7

  
7 8
import com.iver.cit.gvsig.fmap.core.FShape;
8 9
/**
......
60 61
	 * @param targetSymbolShape
61 62
	 * @return
62 63
	 */
63
	public abstract FShape getTextShape(Graphics2D g, FShape targetSymbolShape);
64
	public abstract FShape getTextWrappingShape(Graphics2D g, AffineTransform affineTransform, FShape targetSymbolShape);
64 65

  
65 66
}

Also available in: Unified diff