Révision 1184

tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java (revision 1184)
26 26
import org.eclipse.swt.graphics.Point;
27 27
import org.eclipse.swt.layout.GridData;
28 28
import org.eclipse.swt.widgets.Composite;
29
import org.eclipse.swt.widgets.Display;
29 30
import org.eclipse.swt.widgets.Event;
30 31
import org.eclipse.swt.widgets.Group;
31 32
import org.eclipse.swt.widgets.Label;
......
936 937
			public void focusLost(FocusEvent e) {
937 938
				// TODO Auto-generated method stub
938 939
				swingComponent.setBorder(javax.swing.BorderFactory.createEmptyBorder());
939
				chartEditor.deactivateContext();
940
				Display.getDefault().asyncExec(new Runnable() {
941
					
942
					@Override
943
					public void run() {
944
						// TODO Auto-generated method stub
945
						chartEditor.deactivateContext();						
946
					}
947
				});
940 948
			}
941 949
			
942 950
			@Override
943 951
			public void focusGained(FocusEvent e) {
944 952
				// TODO Auto-generated method stub
945 953
				swingComponent.setBorder(new LineBorder(Color.red, 1));
946
				chartEditor.activateContext();
954
				
955
				Display.getDefault().asyncExec(new Runnable() {
956
					
957
					@Override
958
					public void run() {
959
						// TODO Auto-generated method stub
960
						chartEditor.activateContext();						
961
					}
962
				});
947 963
			}
948 964
		});
949 965
		
tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ThresholdsGroup.java (revision 1184)
27 27
public class ThresholdsGroup extends Group {
28 28

  
29 29
	
30
	protected Label fMinLabel; 
31
	
32
	protected Label fMaxLabel;
33
	
34
	protected Label vMaxLabel;
35
	
36
	
30 37
	/**
31 38
	 * Minimum frequency filtering spinner.
32 39
	 */
......
103 110
		this.setLayout(gridLayout);
104 111

  
105 112
		// Fmin
106
		Label lFmin = new Label(this, SWT.NONE);
107
		lFmin.setText(TXMCoreMessages.common_fMin);
108
		lFmin.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
113
		this.fMinLabel = new Label(this, SWT.NONE);
114
		this.fMinLabel.setText(TXMCoreMessages.common_fMin);
115
		this.fMinLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
109 116

  
110 117
		GridData fieldsGridData = new GridData(GridData.VERTICAL_ALIGN_END);
111 118
		fieldsGridData.minimumWidth = 100;
......
119 126

  
120 127
		// Fmax
121 128
		if(displayFMax)	{
122
			Label lFmax = new Label(this, SWT.NONE);
123
			lFmax.setText(TXMCoreMessages.common_fMax);
124
			lFmax.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
129
			this.fMaxLabel = new Label(this, SWT.NONE);
130
			this.fMaxLabel.setText(TXMCoreMessages.common_fMax);
131
			this.fMaxLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
125 132
	
126 133
			fMaxSpinner = new Spinner(this, SWT.BORDER);
127 134
			fMaxSpinner.setMinimum(0);
......
132 139
		}
133 140
		
134 141
		// Vmax
135
		Label lVmax = new Label(this, SWT.NONE);
136
		lVmax.setText(TXMCoreMessages.VMAX_1);
137
		lVmax.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
142
		this.vMaxLabel = new Label(this, SWT.NONE);
143
		this.vMaxLabel.setText(TXMCoreMessages.VMAX_1);
144
		this.vMaxLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
138 145

  
139 146
		vMaxSpinner = new Spinner(this, SWT.BORDER);
140 147
		vMaxSpinner.setMinimum(0);
......
182 189
	@Override
183 190
	protected void checkSubclass() {
184 191
	}
192

  
193

  
194
	/**
195
	 * @return the fMinLabel
196
	 */
197
	public Label getFMinLabel() {
198
		return fMinLabel;
199
	}
200

  
201

  
202
	/**
203
	 * @return the fMaxLabel
204
	 */
205
	public Label getFMaxLabel() {
206
		return fMaxLabel;
207
	}
208

  
209

  
210
	/**
211
	 * @return the vMaxLabel
212
	 */
213
	public Label getVMaxLabel() {
214
		return vMaxLabel;
215
	}
185 216
	
186 217
}
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java (revision 1184)
63 63
import org.txm.rcp.editors.TableKeyListener;
64 64
import org.txm.rcp.messages.TXMUIMessages;
65 65
import org.txm.rcp.swt.GLComposite;
66
import org.txm.rcp.swt.widget.ThresholdsGroup;
66 67
import org.txm.rcp.swt.widget.structures.PropertiesComboViewer;
67 68
import org.txm.rcp.views.QueriesView;
68 69
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
......
144 145
	protected PropertiesComboViewer unitPropertyComboViewer;
145 146

  
146 147
	
147
	/** The minfreqspinner. */
148
	/**
149
	 * Minimum frequency filter spinner.
150
	 */
148 151
	@Parameter(key=LexicalTablePreferences.F_MIN)
149
	protected Spinner fMinFilterSpinner;
152
	protected Spinner fMinSpinner;
150 153

  
151
	/** The top spinner. */
154
	/**
155
	 * Maximum numbers of lines spinner.
156
	 */
152 157
	@Parameter(key=LexicalTablePreferences.V_MAX)
153
	protected Spinner vMaxFilterSpinner;
158
	protected Spinner vMaxSpinner;
154 159

  
155 160

  
156 161
	
......
214 219
//				public void widgetDefaultSelected(SelectionEvent e) {
215 220
//				}
216 221
//			});
222

  
217 223
			
218
			// Number of lines
219
			Label nLines = new Label(extendedParametersArea, SWT.NONE);
220
			nLines.setText(TXMCoreMessages.common_numberOfLines);
221
			vMaxFilterSpinner = new Spinner(extendedParametersArea, SWT.BORDER);
222
			vMaxFilterSpinner.setMinimum(1);
223
			vMaxFilterSpinner.setMaximum(9999999);
224
			// thresholds
225
			ThresholdsGroup thresholdsGroup = new ThresholdsGroup(this.getExtendedParametersGroup(), SWT.NONE, this, true, false);
226
			this.fMinSpinner = thresholdsGroup.getFMinSpinner();
227
			this.vMaxSpinner = thresholdsGroup.getVMaxSpinner();
228
			this.vMaxSpinner.setMinimum(1);
229
			thresholdsGroup.getVMaxLabel().setText(TXMCoreMessages.common_numberOfLines);
224 230
			
225
			// Fmin
226
			Label fmin = new Label(extendedParametersArea, SWT.NONE);
227
			fmin.setText(TXMCoreMessages.common_fMin);
228
			fMinFilterSpinner = new Spinner(extendedParametersArea, SWT.BORDER);
229
			fMinFilterSpinner.setMinimum(1);
230
			fMinFilterSpinner.setMaximum(9999999);
231
//			// Number of lines
232
//			Label nLines = new Label(extendedParametersArea, SWT.NONE);
233
//			nLines.setText(TXMCoreMessages.common_numberOfLines);
234
//			vMaxSpinner = new Spinner(extendedParametersArea, SWT.BORDER);
235
//			vMaxSpinner.setMinimum(1);
236
//			vMaxSpinner.setMaximum(9999999);
237
//			
238
//			// Fmin
239
//			Label fmin = new Label(extendedParametersArea, SWT.NONE);
240
//			fmin.setText(TXMCoreMessages.common_fMin);
241
//			fMinSpinner = new Spinner(extendedParametersArea, SWT.BORDER);
242
//			fMinSpinner.setMinimum(1);
243
//			fMinSpinner.setMaximum(9999999);
231 244
			
232 245
			
233 246
			// Merge or delete columns button
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LineLabelProvider.java (revision 1184)
162 162
	 * @return the rows
163 163
	 */
164 164
	public List<String> getRows() {
165
		// TODO Auto-generated method stub
166
		return Arrays.asList(rownames);
165
		try {
166
			return Arrays.asList(rownames);
167
		}
168
		catch (Exception e) {
169
			return new ArrayList<String>();
170
		}
167 171
	}
168 172
}
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAFactorialMapChartEditor.java (revision 1184)
247 247
			
248 248
			
249 249
			// advanced parameters
250
			// thresholds
250 251
			ThresholdsGroup thresholdsGroup = new ThresholdsGroup(this.getExtendedParametersGroup(), SWT.NONE, this, true, false);
251 252
			this.fMinSpinner = thresholdsGroup.getFMinSpinner();
252 253
			this.fMaxSpinner = thresholdsGroup.getFMaxSpinner();
253 254
			this.vMaxSpinner = thresholdsGroup.getVMaxSpinner();
255
			this.vMaxSpinner.setMinimum(1);
254 256
			
255 257
	
256 258
	}

Formats disponibles : Unified diff