Revision 259

View differences:

org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.algorithm/org.gvsig.geoprocess.algorithm.dissolve/src/main/java/org/gvsig/geoprocess/algorithm/dissolve/DissolveParametersPanel.java
38 38
import javax.swing.JLabel;
39 39
import javax.swing.JPanel;
40 40

  
41
import org.gvsig.geoprocess.core.CompositeSourceOutputChannel;
42 41
import org.gvsig.geoprocess.lib.api.GeoProcessLocator;
43 42
import org.gvsig.geoprocess.sextante.gui.algorithm.AlgorithmOutputPanel;
44 43
import org.gvsig.gui.beans.table.TableContainer;
......
147 146
	 * Gets the output panel
148 147
	 * @return
149 148
	 */
149
	@SuppressWarnings("unused")
150 150
	private AlgorithmOutputPanel getAlgorithmOutputPanel() {
151 151
		if(algorithmOutputPanel == null)
152 152
		    algorithmOutputPanel = new AlgorithmOutputPanel();
......
308 308
			
309 309
			OutputObjectsSet ooSet = m_Algorithm.getOutputObjects();
310 310
			Output out = ooSet.getOutput(DissolveAlgorithm.RESULT);
311
			out.setOutputChannel(new CompositeSourceOutputChannel(getAlgorithmOutputPanel().getOutputParameters()));
311
			
312
			//Reponer estas l?neas para cambiar el panel de salida y comentar la siguiente
313
			//AlgorithmOutputPanel fsp = getAlgorithmOutputPanel();
314
			//out.setOutputChannel(new CompositeSourceOutputChannel(fsp.getOutputParameters()));
315
	         out.setOutputChannel(outputChannelSelectionPanel.getOutputChannel());
312 316
		} catch (Exception e) {
313 317
			Sextante.addErrorToLog(e);
314 318
		}
org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.algorithm/org.gvsig.geoprocess.algorithm.dissolve/src/main/java/org/gvsig/geoprocess/algorithm/dissolve/DissolveAlgorithm.java
69 69
        setGroup(getTranslation("basic_vect_algorithms"));
70 70
        // setGeneratesUserDefinedRasterOutput(false);
71 71
		try {
72
			m_Parameters.addInputVectorLayer(LAYER, 
73
                getTranslation("Input_layer"),
74
												IVectorLayer.SHAPE_TYPE_WRONG, 
75
												true);
76
			m_Parameters.addBoolean(SELECTED_GEOM, 
77
                getTranslation("Selected_geometries"),
78
									false);
79
			m_Parameters.addBoolean(DISSOLV_ADJ, 
80
                getTranslation("Selected_geometries"),
81
									false);
82
			m_Parameters.addNumericalValue(FIELD, 
83
 getTranslation("Field"),
84
											0,
85
											AdditionalInfoNumericalValue.NUMERICAL_VALUE_INTEGER);
86
            m_Parameters.addString(FUNCTION_LIST,
87
                getTranslation("Function_list"));
88
			addOutputVectorLayer(RESULT,
89
 getTranslation("Dissolve"),
90
								OutputVectorLayer.SHAPE_TYPE_POLYGON);
72
			m_Parameters.addInputVectorLayer(LAYER, getTranslation("Input_layer"), IVectorLayer.SHAPE_TYPE_WRONG, true);
73
			m_Parameters.addBoolean(SELECTED_GEOM, getTranslation("Selected_geometries"), false);
74
			m_Parameters.addBoolean(DISSOLV_ADJ, getTranslation("Selected_geometries"), false);
75
			m_Parameters.addNumericalValue(FIELD, getTranslation("Field"), 0, AdditionalInfoNumericalValue.NUMERICAL_VALUE_INTEGER);
76
            m_Parameters.addString(FUNCTION_LIST, getTranslation("Function_list"));
77
			addOutputVectorLayer(RESULT, getTranslation("Dissolve"), OutputVectorLayer.SHAPE_TYPE_POLYGON);
91 78
		} catch (RepeatedParameterNameException e) {
92 79
			Sextante.addErrorToLog(e);
93 80
		}

Also available in: Unified diff