Revision 13536

View differences:

branches/v10/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/view/legend/gui/FPanelLegendLabels.java
75 75
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
76 76
import com.iver.cit.gvsig.fmap.layers.layerOperations.ClassifiableVectorial;
77 77
import com.iver.cit.gvsig.fmap.rendering.Legend;
78
import com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend;
78 79
import com.iver.cit.gvsig.fmap.rendering.VectorialLegend;
79 80
import com.iver.cit.gvsig.gui.panels.ColorChooserPanel;
80 81
import com.iver.cit.gvsig.gui.utils.FontChooser;
......
206 207
			getJComboBoxHeightField().setEnabled(getJCheckBox().isSelected());
207 208
			getJComboBoxRotationField().setEnabled(getJCheckBox().isSelected());
208 209
		}
210
		if (m_Renderer!=null && ((VectorialLegend)m_Renderer).getLabelHeightField()!=null) {
211
			getRdBtnUseHeightField().setSelected(true);
212
		}else {
213
			getRdBtnUseHeightField().setSelected(false);
214
		}
209 215
		getJRadioButton().setEnabled(getJCheckBox().isSelected());
210 216
		getJRadioButton1().setEnabled(getJCheckBox().isSelected());
211 217
		getRdBtnFixedHeight().setEnabled(getJCheckBox().isSelected());
212 218
		getRdBtnUseHeightField().setEnabled(getJCheckBox().isSelected());
213
		getJTextField().setEnabled(getJCheckBox().isSelected());
219
		getJTextField().setEnabled(getJCheckBox().isSelected() && !getRdBtnUseHeightField().isSelected());
220
		getJComboBoxHeightField().setEnabled(getJCheckBox().isSelected() && getRdBtnUseHeightField().isSelected());
214 221
		getJCheckBoxTextOnly().setEnabled(getJCheckBox().isSelected());
215 222
		if (m_colorChooser != null)
216 223
			m_colorChooser.setEnabled(getJCheckBox().isSelected());
......
248 255
			m_FSymbol.setFontColor(m_colorChooser.getColor());
249 256
			//m_FSymbol.setSymbolType(m_Renderer.getShapeType());
250 257
			String s=getJTextField().getText().replace(',','.');
251
			float fontSize = Float.parseFloat(s);
252
			fontSize *= FConstant.FONT_HEIGHT_SCALE_FACTOR;
258
			float fontSize=0;
259
			try {
260
				fontSize = Float.parseFloat(s);
261
			}catch (NumberFormatException e) {
262
				fontSize=0;
263
			}
264
				fontSize *= FConstant.FONT_HEIGHT_SCALE_FACTOR;
253 265
			if (!getJRadioButton().isSelected())
254 266
			{
255 267
				// meters

Also available in: Unified diff