/ - Diff - Application: gvSIG desktop - gvSIG

Revision 25260

     public class ExtrusionLegend extends VectorialUniqueValueLegend {
     	private BaseExtrusionSymbol defaultSimbolExtrusion;
     	private double factorExtrusion;
     	private double extrusionFactor;
     	public ExtrusionLegend(int shapeType) {
     		super(shapeType);
+    	}
-...
     		if (theSymbol== null)
     			return null;
     		factorExtrusion = Double.parseDouble(theSymbol.getDescription());
     		double extrusion = Double.parseDouble(theSymbol.getDescription());
     		defaultSimbolExtrusion = new BaseExtrusionSymbol(factorExtrusion);
     		defaultSimbolExtrusion = new BaseExtrusionSymbol(extrusion);
     		if (theSymbol.getClass().equals(SimpleFillSymbol.class)) {// Nuevo s?mbolo pol?gono
     			Color color = ((IFillSymbol)theSymbol).getFillColor();
     			defaultSimbolExtrusion.setFillColor(color);
-...
     		return defaultSimbolExtrusion;
+    	}
     	public String getClassName() {
     		return getClass().getName();
+    	}
     	public double getExtrusionFactor() {
     		return extrusionFactor;
+    	}
     	public void setExtrusionFactor(double extrusionFactor) {
     		this.extrusionFactor = extrusionFactor;
+    	}
     //	@Override
     //	public String[] getDescriptions() {
     //
     //		 String[] descriptions = new String[this.getSymbols().length];
     //		ISymbol[] auxSym = getSymbols();
     //
     //
     //		for (int i = 0; i < descriptions.length; i++) {
     //			descriptions[i] = auxSym[i].getgetDescription();
     //			descriptions[i] = ((Value) auxLegend.getValues()[i])
     //					.producto(ValueFactory.createValue(extrusionValue));
     //		}
     //
     //        Object[] extrudedValue = auxLegend.getValues();
     //
     //        for (int i = 0; i < extrudedValue.length; i++) {
     //
     //         	try {
     //         		if(jtvariable.isEnabled())
     //         			extrudedValue[i] = ((Value)auxLegend.getValues()[i]).producto(ValueFactory.createValue(extrusionValue));
     //         		else
     //         			extrudedValue[i] = ValueFactory.createValue(extrusionFixedValue);
     // 			}catch (IncompatibleTypesException e) {
     // 				// TODO Auto-generated catch block
     //
     // 				e.printStackTrace();
     // 			}
     //
     //        }
     //
     //
     //        String[] descriptions = new String[symbols.size()];
     //		ISymbol[] auxSym = getSymbols();
     //
     //		for (int i = 0; i < descriptions.length; i++)
     //			descriptions[i] = auxSym[i].getDescription();
     //
     //		return descriptions;
     //
     //
     //
     //		// TODO Auto-generated method stub
     //		return super.getDescriptions();
     //	}
     //	@Override
     //	public ISymbol getDefaultSymbol() {
     //		// TODO Auto-generated method stub
     //		return new BaseExtrusionSymbol(0.0);
     //	}
     //	@Override
     //	public void setDefaultSymbol(ISymbol s) {
     //		// TODO Auto-generated method stub
     //		super.setDefaultSymbol(s);
     //	}
     	public XMLEntity getXMLEntity() {
     		return super.getXMLEntity();
     //		XMLEntity xml = super.getXMLEntity();
     		XMLEntity xml = new XMLEntity();
     		xml.putProperty("className", this.getClassName());
     		xml.putProperty("fieldNames", getClassifyingFieldNames()[0]);
     		xml.putProperty("fieldTypes", getClassifyingFieldTypes()[0]);
     		xml.putProperty("extrusionFactor", this.extrusionFactor);
     		return xml;
+    	}
     	public void setXMLEntity(XMLEntity xml) {
     		super.setXMLEntity(xml);
     		// TODO: It is necessary to insert here all the properties to load with the extrusion legend.
     //		super.setXMLEntity(xml);
     		clear();
     		if (xml.contains("fieldName"))
     			setClassifyingFieldNames(new String[] {xml.getStringProperty("fieldName")});
     		else
     			setClassifyingFieldNames(xml.getStringArrayProperty("fieldNames"));
     		if (xml.contains("fieldTypes"))
     			setClassifyingFieldTypes(new int[] {xml.getIntProperty("fieldTypes")});
     		if (xml.contains("extrusionFactor"))
     			extrusionFactor = xml.getDoubleProperty("extrusionFactor");
+    	}
+    }

     	//private static Logger logger = Logger.getLogger(VectorialUniqueValue.class.getName());
         private VectorialUniqueValueLegend theLegend;
         private ExtrusionLegend theLegend;
         private ClassifiableVectorial layer;
         private SymbolTableExtrusion symbolTable;
         private JComboBox cmbFields;
         private JButton btnRemoveAll;
         private JButton btnRemove;
         private JCheckBox chbUseDefault = null;
         private VectorialUniqueValueLegend auxLegend;
         private ExtrusionLegend auxLegend;
     	private JPanel pnlCenter;
     	private ZSort zSort;
     	private JButton btnOpenSymbolLevelsEditor;
-...
     	private JCheckBox fixedOption;
     	private double extrusionFixedValue = 1;
     	private Value aux;
     	private Value aux;
         /**
+         *
          */
         public ExtrusionLegendPanel() {
             super();
             if (theLegend!=null)
             	this.extrusionValue = ((ExtrusionLegend)this.theLegend).getExtrusionFactor();
             initialize();
+        }
-...
             pAux1 = new JPanel();
             pAux1.add(new JLabel(PluginServices.getText(this, "Nivel_de_extrusion")+":"));
             jtvariable = new JTextField(PluginServices.getText(this, "1"),3);
             jtvariable = new JTextField(PluginServices.getText(this, ""+this.extrusionValue),3);
             jtvariable.setColumns(3);
             jtvariable.setHorizontalAlignment(JTextField.RIGHT);
             jtvariable.setToolTipText(PluginServices.getText(this, "Valor_inicial") + " * " + PluginServices.getText(this, "Nivel_de_extrusion"));
-...
                 //auxLegend=(VectorialUniqueValueLegend)m_lyr.getLegend();
     //            auxLegend = LegendFactory.createVectorialUniqueValueLegend(layer.getShapeType());
                 auxLegend = new ExtrusionLegend(layer.getShapeType());
                 auxLegend.setExtrusionFactor(this.extrusionValue);
                 //Object resul;
                 if (chbUseDefault.isSelected()) {
                     auxLegend.getDefaultSymbol().setDescription("Default");
-...
             symbolTable.removeAllItems();
             if (legend instanceof VectorialUniqueValueLegend) {
                 theLegend = (VectorialUniqueValueLegend) legend;
                 theLegend = (ExtrusionLegend) legend;
                 getChbUseDefault().setSelected(theLegend.isUseDefaultSymbol());
                 cmbFields.getModel().setSelectedItem(theLegend.getClassifyingFieldNames()[0]);
                 symbolTable.fillTableFromSymbolList(theLegend.getSymbols(),
-...
                 									theLegend.getDescriptions());
                 zSort = theLegend.getZSort();
             } else {
                 theLegend = new VectorialUniqueValueLegend(shapeType);
                 theLegend = new ExtrusionLegend(shapeType);
+            }
+        }

     package com.iver.ai2.gvsig3d.legend.symbols;
     import com.iver.cit.gvsig.fmap.core.symbols.SimpleFillSymbol;
     import com.iver.utiles.XMLEntity;
     public class BaseExtrusionSymbol extends SimpleFillSymbol implements
     		IExtrusionSymbol {
-...
     		super();
     		this.extrusion = extrusion;
+    	}
     	public String getClassName() {
     		return getClass().getName();
+    	}
     	public XMLEntity getXMLEntity() {
     		XMLEntity xml = super.getXMLEntity();
     		xml.putProperty("extrusion", this.extrusion);
     		return xml;
+    	}
     	public void setXMLEntity(XMLEntity xml) {
     		super.setXMLEntity(xml);
     		if (xml.contains("extrusion"))
     			extrusion = xml.getDoubleProperty("extrusion");
+    	}
+    }

Also available in: Unified diff