/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

Révision 1042

+    	}
     	/**
     	 * Instantiates a new vector impl.
+    	 *
     	 * @param data the data
     	 * @throws RWorkspaceException the r workspace exception
     	 */
     	public VectorImpl(List<String> data) throws RWorkspaceException {
     		super();
     		rw.addVectorToWorkspace(symbol, data.toArray(new String[data.size()]));
     		length = data.size();
+    	}
     	/**
     	 * Instantiates a new vector.
+    	 *
     	 * @param data the data

     package org.txm.specificities.core.chartsengine.jfreechart;
     import java.awt.Color;
     import java.util.List;
     import org.jfree.chart.JFreeChart;
     import org.jfree.chart.axis.NumberAxis;
-...
     			String[] xAxisSymbols;
     			// Transpose the data set
     			if(specificitiesSelection.isGroupingByLines())	{
     		        xAxisSymbols = new String[specificitiesSelection.getSelectedTypeNames().length];
     			List<String> types = specificitiesSelection.getSelectedTypeNames();
     			String[] parts = specificitiesSelection.getSelectedPartNames();
     			if (specificitiesSelection.isGroupingByLines())	{
     		        xAxisSymbols = new String[types.size()];
     				for(int i = 0; i < specificitiesSelection.getSelectedPartNames().length; i++) {
     					XYSeries series = new XYSeries(specificitiesSelection.getSelectedPartNames()[i]);
     				for(int i = 0; i < parts.length; i++) {
     					XYSeries series = new XYSeries(parts[i]);
     					dataset.addSeries(series);
     					for(int j = 0; j < specificitiesSelection.getSelectedTypeNames().length; j++) {
     					for(int j = 0; j < types.size(); j++) {
     						series.add(j, specificitiesSelection.getSelectedSpecificitiesIndex()[j][i]);
     						// Add X axis symbol
     						xAxisSymbols[j] = specificitiesSelection.getSelectedTypeNames()[j];
     						xAxisSymbols[j] = types.get(j);
+    					}
+    				}
+    			}
     			else {
     		        xAxisSymbols = new String[specificitiesSelection.getSelectedPartNames().length];
     		        xAxisSymbols = new String[parts.length];
     				for(int i = 0; i < specificitiesSelection.getSelectedTypeNames().length; i++) {
     				for(int i = 0; i < types.size(); i++) {
     					XYSeries series = new XYSeries(specificitiesSelection.getSelectedTypeNames()[i]);
     					XYSeries series = new XYSeries(types.get(i));
     					dataset.addSeries(series);
     					for(int j = 0; j < specificitiesSelection.getSelectedPartNames().length; j++) {
     					for(int j = 0; j < parts.length; j++) {
     						series.add(j, specificitiesSelection.getSelectedSpecificitiesIndex()[i][j]);
     						// Add X axis symbol
     						xAxisSymbols[j] = specificitiesSelection.getSelectedPartNames()[j];
     						xAxisSymbols[j] = parts[j];
+    					}
+    				}
+    			}
     	        // Custom range axis for ticks drawing options

tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/r/RSpecificitiesBarChartCreator.java (revision 1042)
83	83	}
84	84	// to put one color per word
85	85	else {
86		itemsCount = specificitiesSelection.getSelectedTypeNames().length;
	86	itemsCount = specificitiesSelection.getSelectedTypeNames().size();
87	87	}
88	88
89	89	String[] colors = new String[itemsCount];

     package org.txm.specificities.core.functions;
     import java.io.File;
     import java.util.ArrayList;
     import java.util.Arrays;
     import java.util.HashSet;
     import java.util.List;
     import org.apache.commons.lang.StringUtils;
     import org.txm.chartsengine.core.results.ChartResult;
-...
      */
     public class SpecificitiesSelection extends ChartResult {
     	/**
     	 * The selected type names to focus on.
     	 * Banality threshold.
     	 */
     	protected String[] selectedTypeNames;
     	@Parameter(key=SpecificitiesPreferences.CHART_BANALITY, type=Parameter.RENDERING)
     	protected Float pBanality;
     	/**
     	 * The selected specificities indices to focus on.
     	 * To draw bars or not.
     	 */
     	protected double[][] selectedSpecificitiesIndex;
     	@Parameter(key=SpecificitiesPreferences.CHART_DRAW_BARS, type=Parameter.RENDERING)
     	protected Boolean pDrawBars;
     	/**
     	 * To draw lines or not.
     	 */
     	@Parameter(key=SpecificitiesPreferences.CHART_DRAW_LINES, type=Parameter.RENDERING)
     	protected Boolean pDrawLines;
     	/**
     	 * Group by lines / transpose matrix.
     	 */
     	@Parameter(key=SpecificitiesPreferences.CHART_GROUP_BY_LINES, type=Parameter.RENDERING)
     	protected boolean groupByLines;
     	/**
     	 * Banality threshold.
     	 */
     	@Parameter(key=SpecificitiesPreferences.CHART_BANALITY, type=Parameter.RENDERING)
     	protected float banality;
     	protected Boolean pGroupByLines;
     	/**
     	 * To draw bars or not.
     	 * The selected specificities indices to focus on.
     	 */
     	@Parameter(key=SpecificitiesPreferences.CHART_DRAW_BARS, type=Parameter.RENDERING)
     	protected boolean drawBars;
     	protected double[][] selectedSpecificitiesIndex;
     	/**
     	 * To draw lines or not.
     	 * The selected type names to focus on.
     	 */
     	@Parameter(key=SpecificitiesPreferences.CHART_DRAW_LINES, type=Parameter.RENDERING)
     	protected boolean drawLines;
     	@Parameter(key=SpecificitiesPreferences.VALUES, type=Parameter.RENDERING)
     	protected List<String> pSelectedTypeNames;
     	/**
     	 * Creates an empty SpecificitiesSelection.
     	 * @param parent
-...
     		super(parent);
+    	}
     	public SpecificitiesSelection(String uuid)	{
     		this(uuid, null);
+    	}
     	public SpecificitiesSelection(String uuid, Specificities parent)	{
     		super(uuid, parent);
+    	}
     	public Specificities getParent() {
     		return (Specificities)super.getParent();
+    	}
     	@Override
     	public boolean loadParameters() {
     		// nothing to do
     		return true;
     	protected boolean _compute() throws Exception {
     		Specificities specificities = getParent();
     		double[][] tableLines = specificities.getSpecificitesIndex();
     		String[] partNames = specificities.getPartShortNames();
     		String[] rowNames = specificities.getTypeNames();
     		selectedSpecificitiesIndex = new double[pSelectedTypeNames.size()][partNames.length];
     		int n = 0;
     		for (int i = 0; i < rowNames.length; i++) {
     			double[] line = tableLines[i];
     			String rowName = rowNames[i];
     			if (pSelectedTypeNames.contains(rowName)) {
     				selectedSpecificitiesIndex[n++] = line;
+    			}
+    		}
     		return selectedSpecificitiesIndex.length > 0;
+    	}
     	@Override
     	public boolean saveParameters() {
     		// nothing to do
     		return true;
     	public boolean canCompute() throws Exception {
     		return this.parent != null;
+    	}
     	/**
     	 * @return the selectedTypeNames
     	 */
     	public String[] getSelectedTypeNames() {
     		return selectedTypeNames;
     	@Override
     	public void clean() {
     		//does nothing
+    	}
     	/**
     	 * @param selectedTypeNames the selectedTypeNames to set
     	 * @return the banality
     	 */
     	public void setSelectedTypeNames(String[] selectedTypeNames) {
     		this.selectedTypeNames = selectedTypeNames;
     	public float getBanality() {
     		return pBanality;
+    	}
     	@Override
     	public String getDetails() {
     		StringBuilder sb = new StringBuilder();
     		sb.append(this.getName());
     		if (pBanality != null) {
     			sb.append("\n\t"+"banality: "+this.pBanality);
+    		}
     		if (pDrawBars != null) {
     			sb.append("\n\t"+"draw bars: "+this.pDrawBars);
+    		}
     		if (pDrawLines != null) {
     			sb.append("\n\t"+"draw lines: "+this.pDrawLines);
+    		}
     		if (pGroupByLines != null) {
     			sb.append("\n\t"+"group lines: "+this.pGroupByLines);
+    		}
     		return sb.toString();
+    	}
     	@Override
     	public String getName() {
     		String name = "[" + StringUtils.join(this.pSelectedTypeNames, ", ") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     		if (name.length() > 80) {
     			name = name.substring(0, 79) + "...";
+    		}
     		return name;
+    	}
     	@Override
     	public String getResultype() {
     		return SpecificitiesCoreMessages.SELECTION_RESULT_TYPE;
+    	}
     	/**
     	 * @return the selectedPartNames
     	 */
-...
+    	}
     	/**
     	 * @param selectedSpecificitiesIndex the selectedSpecificitiesIndex to set
     	 * @return the selectedTypeNames
     	 */
     	public void setSelectedSpecificitiesIndex(double[][] selectedSpecificitiesIndex) {
     		this.selectedSpecificitiesIndex = selectedSpecificitiesIndex;
     	public List<String> getSelectedTypeNames() {
     		return pSelectedTypeNames;
+    	}
     	@Override
     	public String getName() {
     		String name = "[" + StringUtils.join(this.selectedTypeNames, ", ") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     		if (name.length() > 80) {
     			name = name.substring(0, 79) + "...";
+    		}
     		return name;
+    	}
     	@Override
     	public String getSimpleName() {
     		// TODO Auto-generated method stub
     		return this.getName();
+    	}
     	@Override
     	public String getDetails() {
     		// TODO Auto-generated method stub
     		return this.getName();
     	/**
     	 * @return the drawBars
     	 */
     	public boolean isDrawingBars() {
     		return pDrawBars;
+    	}
     	@Override
     	public void clean() {
     		//does nothing
     	/**
     	 * @return the drawLines
     	 */
     	public boolean isDrawingLines() {
     		return pDrawLines;
+    	}
     	@Override
     	public boolean canCompute() throws Exception {
     		return this.parent != null;
     	/**
     	 * @return the groupByLines
     	 */
     	public boolean isGroupingByLines() {
     		return pGroupByLines;
+    	}
     	@Override
     	protected boolean _compute() throws Exception {
     		// does nothing
     	public boolean loadParameters() {
     		String str = this.getStringParameterValue(SpecificitiesPreferences.VALUES);
     		if (!str.isEmpty()) {
     			pSelectedTypeNames = Arrays.asList(str.split("\t"));
+    		}
     		return true;
+    	}
     	@Override
     	public boolean setParameters(TXMParameters parameters) {
     		// TODO Auto-generated method stub
     		System.err.println("SpecificitiesSelection.setParameters(): not yet implemented.");
     	public boolean saveParameters() {
     		if (pSelectedTypeNames != null) {
     			this.saveParameter(SpecificitiesPreferences.VALUES, StringUtils.join(pSelectedTypeNames, "\t"));
+    		}
     		return true;
+    	}
     	@Override
     	public boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception {
     		// TODO Auto-generated method stub
     		return false;
+    	}
     	/**
     	 * @return the groupByLines
     	 * @param banality the banality to set
     	 */
     	public boolean isGroupingByLines() {
     		return groupByLines;
     	public void setBanality(float banality) {
     		this.pBanality = banality;
+    	}
     	/**
     	 * @param groupByLines the groupByLines to set
     	 */
     	public void setGroupByLines(boolean groupByLines) {
     		this.groupByLines = groupByLines;
     		this.pGroupByLines = groupByLines;
+    	}
     	/**
     	 * @return the banality
     	 */
     	public float getBanality() {
     		return banality;
     	@Override
     	public void setHasBeenComputedOnce(boolean hasBeenComputedOnce) {
     		// redefined to not reset the chart
+    	}
     	/**
     	 * @param banality the banality to set
     	 */
     	public void setBanality(float banality) {
     		this.banality = banality;
     	@Override
     	public boolean setParameters(TXMParameters parameters) {
     		// TODO Auto-generated method stub
     		System.err.println("SpecificitiesSelection.setParameters(): not yet implemented.");
     		return true;
+    	}
     	/**
     	 * @return the drawBars
     	 * @param selectedTypeNames the selectedTypeNames to set
     	 */
     	public boolean isDrawingBars() {
     		return drawBars;
     	public void setSelectedTypeNames(List<String> selectedTypeNames) {
     		this.pSelectedTypeNames = selectedTypeNames;
+    	}
     	/**
     	 * @return the drawLines
     	 */
     	public boolean isDrawingLines() {
     		return drawLines;
+    	}
     	@Override
     	public void setHasBeenComputedOnce(boolean hasBeenComputedOnce) {
     		// redefined to not reset the chart
     	public boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception {
     		// TODO Auto-generated method stub
     		return false;
+    	}
     	@Override
     	public String getResultype() {
     		return SpecificitiesCoreMessages.SELECTION_RESULT_TYPE;
+    	}
+    }

     package org.txm.specificities.rcp.handlers;
     import java.util.Arrays;
     import org.eclipse.core.commands.ExecutionEvent;
     import org.eclipse.core.commands.ExecutionException;
     import org.eclipse.jface.viewers.IStructuredSelection;
-...
     				specificitiesSelection = new SpecificitiesSelection(specificities);
     				// Set the data to focus on
     				specificitiesSelection.setSelectedTypeNames(selectedTypeNames);
     				specificitiesSelection.setSelectedSpecificitiesIndex(selectedSpecificitiesIndices);
     				specificitiesSelection.setSelectedTypeNames(Arrays.asList(selectedTypeNames));
     			} catch (Exception e) {
     				System.out.println("Error while computing specificities bar chart: " + e.getLocalizedMessage());

Formats disponibles : Unified diff

Laboratoire ICAR » Plateforme TXM

Révision 1042