Revision 11276

View differences:

trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/symbols/CharacterMarkerSymbol.java
43 43
 *
44 44
 * $Id$
45 45
 * $Log$
46
 * Revision 1.11  2007-04-19 14:21:30  jaume
46
 * Revision 1.12  2007-04-19 16:01:27  jaume
47 47
 * *** empty log message ***
48 48
 *
49
 * Revision 1.11  2007/04/19 14:21:30  jaume
50
 * *** empty log message ***
51
 *
49 52
 * Revision 1.10  2007/03/26 14:24:13  jaume
50 53
 * implemented Print
51 54
 *
......
150 153
import java.awt.geom.AffineTransform;
151 154
import java.awt.geom.Point2D;
152 155

  
153
import javax.print.attribute.PrintRequestAttributeSet;
154

  
155
import org.apache.batik.ext.awt.geom.PathLength;
156

  
157 156
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
158 157
import com.iver.cit.gvsig.fmap.core.FPoint2D;
159 158
import com.iver.cit.gvsig.fmap.core.FShape;
160 159
import com.iver.cit.gvsig.fmap.core.SymbologyFactory;
161
import com.iver.cit.gvsig.fmap.core.v02.FConverter;
160
import com.iver.cit.gvsig.fmap.core.v02.FConstant;
162 161
import com.iver.cit.gvsig.fmap.core.v02.FSymbol;
163 162
import com.iver.utiles.StringUtilities;
164 163
import com.iver.utiles.XMLEntity;
165
import com.vividsolutions.jts.geom.Geometry;
166 164

  
167 165

  
168 166
/**
......
227 225
	}
228 226

  
229 227
	public void draw(Graphics2D g, AffineTransform affineTransform, FShape shp) {
230
		g.setFont(getFont());
228
		double unitFactor = getScaleX();
229
//		if (unitFactor > 0) {
230
//			// disctance units
231
//			System.err.println("affine scale = "+affineTransform.getScaleX()+", unitFactor="+unitFactor+", FONT_HEIGHT_SCALE"+FConstant.FONT_HEIGHT_SCALE_FACTOR+"::"+affineTransform.getScaleX()*unitFactor*FConstant.FONT_HEIGHT_SCALE_FACTOR);
232
//			g.setFont(getFont().deriveFont((float)
233
//					(affineTransform.getScaleX()*unitFactor*FConstant.FONT_HEIGHT_SCALE_FACTOR)));
234
//		} else {
235
			g.setFont(getFont());
236
//		}
237

  
231 238
		g.setColor(getColor());
232 239
		double theta = getRotation();
233 240
		int xOffset = (int) getOffset().getX(); // * multiplicador d'unitats;
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/styling/AttrInTableLabeling.java
76 76
		double scale = viewPort.getScale();
77 77
		double fontScaleFactor = FConstant.FONT_HEIGHT_SCALE_FACTOR;
78 78

  
79
		if (unitFactor >= 0) {
79
		if (unitFactor > 0) {
80 80
			// distance units
81 81
			fontScaleFactor *= Math.abs(
82 82
					viewPort.getAffineTransform().getScaleY()*unitFactor
trunk/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/legend/gui/LabelingManager.java
1070 1070
				strategy.setUsesFixedSize(getRdBtnFixedHeight().isSelected());
1071 1071
				strategy.setFixedSize(fixedSize);
1072 1072
				// add more attributes for AttrInTableLabeling (if you need) here
1073
				
1074
				
1073 1075
				double unitFactor;
1074 1076
				try {
1075 1077
					unitFactor = Attributes.CHANGE[getCmbUnits().getSelectedIndex()]/100;
1076 1078
				} catch (ArrayIndexOutOfBoundsException aioobEx) { //jijiji
1077
					unitFactor = -1; // which represents size in pixel
1079
					unitFactor = 0; // which represents size in pixel
1078 1080
				}
1079 1081
				strategy.setUnitFactor(unitFactor);
1080 1082
				layer.setLabelingStrategy(strategy);

Also available in: Unified diff