Revision 2682

tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java (revision 2682)
50 50
import org.eclipse.swt.widgets.TableItem;
51 51
import org.eclipse.ui.IEditorSite;
52 52
import org.eclipse.ui.IPropertyListener;
53
import org.rosuda.REngine.REXPMismatchException;
53 54
import org.txm.ca.core.chartsengine.base.CAChartCreator;
54 55
import org.txm.ca.core.functions.CA;
55 56
import org.txm.ca.core.functions.Eigenvalues;
......
323 324
			
324 325
			@Override
325 326
			public Object getTableInput() {
326
				return ca.getColInfos();
327
				try {
328
					return ca.getColInfos();
329
				}
330
				catch (REXPMismatchException e) {
331
					e.printStackTrace();
332
					return null;
333
				}
327 334
			}
328 335
		};
329 336
		
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAFactorialMapChartEditor.java (revision 2682)
55 55
	// @Parameter(key=CAPreferences.SECOND_DIMENSION)
56 56
	// protected int secondDimension = 2;
57 57
	
58
	
59 58
	/**
60 59
	 * To show/hide individuals.
61 60
	 */
......
74 73
	@Parameter(key = CAPreferences.SHOW_POINT_SHAPES)
75 74
	protected ToolItem showPointShapes;
76 75
	
77
	
78 76
	/**
79 77
	 * Unit property.
80 78
	 */
81 79
	@Parameter(key = TXMPreferences.UNIT_PROPERTY)
82 80
	protected PropertiesComboViewer unitPropertyComboViewer;
83 81
	
84
	
85 82
	/**
86 83
	 * Minimum frequency filtering spinner.
87 84
	 */
......
89 86
	protected Spinner fMinSpinner;
90 87
	
91 88
	/**
89
	 * Maximum frequency filtering spinner.
90
	 */
91
	@Parameter(key = TXMPreferences.F_MAX)
92
	protected Spinner fMaxSpinner;
93
	
94
	/**
92 95
	 * Maximum number of lines filtering.
93 96
	 */
94 97
	@Parameter(key = TXMPreferences.V_MAX)
95 98
	protected Spinner vMaxSpinner;
96 99
	
97
	
98 100
	/**
99 101
	 *
100 102
	 * @param chartEditorInput
101 103
	 */
102
	public CAFactorialMapChartEditor(ChartEditorInput chartEditorInput) {
104
	public CAFactorialMapChartEditor(ChartEditorInput<CA> chartEditorInput) {
103 105
		super(chartEditorInput);
104 106
	}
105 107
	
......
263 265
		// thresholds
264 266
		if (!this.getResult().getParent().isVisible()  // the LT parent is not visible
265 267
				&& !(this.getResult().getParent().getParent() instanceof PartitionIndex)) { // and its parent is not a PartitionIndex
266
			ThresholdsGroup thresholdsGroup = new ThresholdsGroup(this.getExtendedParametersGroup(), SWT.NONE, this, false, false);
268
			ThresholdsGroup thresholdsGroup = new ThresholdsGroup(this.getExtendedParametersGroup(), SWT.NONE, this, false, true);
267 269
			this.fMinSpinner = thresholdsGroup.getFMinSpinner();
270
			this.fMaxSpinner = thresholdsGroup.getFMaxSpinner();
268 271
			this.vMaxSpinner = thresholdsGroup.getVMaxSpinner();
269 272
			this.vMaxSpinner.setMinimum(1);
270 273
		}
......
295 298
		}
296 299
	}
297 300
	
298
	
299 301
	@Override
300 302
	protected void onInit() {
301 303
		
......
329 331
				// TODO Auto-generated method stub
330 332
			}
331 333
		});
332
		
333 334
	}
334
	
335 335
}

Also available in: Unified diff