Révision 1938

tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAFactorialMapChartEditor.java (revision 1938)
193 193
		String items[] = { "(1,2)", "(1,3)", "(2,3)" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
194 194

  
195 195
		
196
//
197
//		ToolItem renderingComboItem = new ToolItem(this.chartToolBar, SWT.SEPARATOR);
198
//		
199
//		final ComboViewer plansComboViewer = new ComboViewer(this.chartToolBar);
200
//		plansComboViewer.setContentProvider(ArrayContentProvider.getInstance());
201
//		plansComboViewer.setInput(items);
202
//		//this.chartToolBar.addControl(plansComboViewer.getCombo());
203
//		
204
//		renderingComboItem.setControl(plansComboViewer.getControl());
205
//		plansComboViewer.getControl().pack();
206
//		renderingComboItem.setWidth(plansComboViewer.getControl().getBounds().width);
207
//		
208
//		
209
//		// Preselect the plan from the CA data
210
//		if(this.getIntParameterValue(CAPreferences.FIRST_DIMENSION) == 2)	{
211
//			plansComboViewer.getCombo().select(2);
212
//		}
213
//		else if(this.getIntParameterValue(CAPreferences.SECOND_DIMENSION) == 3)	{
214
//			plansComboViewer.getCombo().select(1);
215
//		}
216
//		else	{
217
//			plansComboViewer.getCombo().select(0);
218
//		}
219
//		
220
//		plansComboViewer.getControl().pack();
221
//		
222
//		plansComboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
223
//			
224
//			@Override
225
//			public void selectionChanged(SelectionChangedEvent e) {
226
//				// TODO Auto-generated method stub
227
//				boolean resetView = false;
228
//
229
//				// Change factors
230
//				if(e.getSource() == plansComboViewer)	{
231
//
232
//					Combo plans = (Combo) ((ComboViewer) e.getSource()).getCombo();
233
//
234
//					int dimension1 = 1;
235
//					int dimension2 = 2;
236
//
237
//					String str = plans.getItem(plans.getSelectionIndex());
238
//					str = str.substring(1, str.length() -1); // remove ( and )
239
//					String[] split = str.split(","); // 2 items //$NON-NLS-1$
240
//					dimension1 = Integer.parseInt(split[0]);
241
//					dimension2 = Integer.parseInt(split[1]);
242
//
243
//					getResult().setFirstDimension(dimension1);
244
//					getResult().setSecondDimension(dimension2);
245
//
246
//					resetView = true;
247
//				}
248
//				getResult().setChartDirty();
249
//				getResult().setNeedsToResetView(resetView);
250
//				compute(true);
251
//			}
252
//		});
253
		
254
		ToolItem plansComboItem = new ToolItem(this.chartToolBar, SWT.SEPARATOR);
255
		final Combo plansCombo = new Combo(this.chartToolBar, SWT.READ_ONLY);
196 256

  
197
		ToolItem renderingComboItem = new ToolItem(this.chartToolBar, SWT.SEPARATOR);
257
		plansComboItem.setControl(plansCombo);
258
		plansCombo.pack();
259
		plansComboItem.setWidth(plansCombo.getBounds().width);
198 260
		
199
		final ComboViewer plansComboViewer = new ComboViewer(this.chartToolBar);
200
		plansComboViewer.setContentProvider(ArrayContentProvider.getInstance());
201
		plansComboViewer.setInput(items);
202
		//this.chartToolBar.addControl(plansComboViewer.getCombo());
203
		
204
		renderingComboItem.setControl(plansComboViewer.getControl());
205
		plansComboViewer.getControl().pack();
206
		renderingComboItem.setWidth(plansComboViewer.getControl().getBounds().width);
207
		
208
		
261
		// FIXME: commented because the infos panel is not ready to manage more axes
262
		//		ArrayList<String> planes = null;
263
		//		try {
264
		//			int nbsv = ((CA) editorPart.getResultData()).getSingularValues().length;
265
		//			planes = new ArrayList<String>();
266
		//			for(int i = 1 ; i < nbsv ; i ++)	{
267
		//				for(int j = i ; j < nbsv ; j++)	{
268
		//					if(i != j)	{
269
		//						planes.add("("+i+","+j+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
270
		//					}
271
		//				}
272
		//			}
273
		//		}
274
		//		catch (StatException e1) {
275
		//			// TODO Auto-generated catch block
276
		//			org.txm.utils.logger.Log.printStackTrace(e1);
277
		//		}
278
		//		String [] items = planes.toArray(new String[planes.size()]);
279

  
280

  
281
		// TODO : commented because the infos panel is not ready to manage more axes
282
		//		if(couples != null && couples.size() > 3)	{
283
		//			items = couples.toArray(new String[couples.size()]);
284
		//}
285

  
286

  
287
		plansCombo.setItems(items);
288

  
209 289
		// Preselect the plan from the CA data
210 290
		if(this.getIntParameterValue(CAPreferences.FIRST_DIMENSION) == 2)	{
211
			plansComboViewer.getCombo().select(2);
291
			plansCombo.select(2);
212 292
		}
213 293
		else if(this.getIntParameterValue(CAPreferences.SECOND_DIMENSION) == 3)	{
214
			plansComboViewer.getCombo().select(1);
294
			plansCombo.select(1);
215 295
		}
216 296
		else	{
217
			plansComboViewer.getCombo().select(0);
297
			plansCombo.select(0);
218 298
		}
219
		
220
		plansComboViewer.getControl().pack();
221
		
222
		plansComboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
223
			
299

  
300
		//this.chartToolBar.addControl(plansCombo);
301

  
302
		// Listeners
303
		SelectionListener listener = new SelectionListener() {
304

  
224 305
			@Override
225
			public void selectionChanged(SelectionChangedEvent e) {
226
				// TODO Auto-generated method stub
306
			public void widgetSelected(SelectionEvent e) {
307

  
227 308
				boolean resetView = false;
228 309

  
229 310
				// Change factors
230
				if(e.getSource() == plansComboViewer)	{
311
				if(e.getSource() == plansCombo)	{
231 312

  
232
					Combo plans = (Combo) ((ComboViewer) e.getSource()).getCombo();
313
					Combo plans = (Combo) e.getSource();
233 314

  
234 315
					int dimension1 = 1;
235 316
					int dimension2 = 2;
......
248 329
				getResult().setChartDirty();
249 330
				getResult().setNeedsToResetView(resetView);
250 331
				compute(true);
332
				//forceFocus();
251 333
			}
252
		});
253
		
254
//		final Combo plansCombo = new Combo(this.chartToolBar, SWT.READ_ONLY);
255
//
256
//		// FIXME: commented because the infos panel is not ready to manage more axes
257
//		//		ArrayList<String> planes = null;
258
//		//		try {
259
//		//			int nbsv = ((CA) editorPart.getResultData()).getSingularValues().length;
260
//		//			planes = new ArrayList<String>();
261
//		//			for(int i = 1 ; i < nbsv ; i ++)	{
262
//		//				for(int j = i ; j < nbsv ; j++)	{
263
//		//					if(i != j)	{
264
//		//						planes.add("("+i+","+j+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
265
//		//					}
266
//		//				}
267
//		//			}
268
//		//		}
269
//		//		catch (StatException e1) {
270
//		//			// TODO Auto-generated catch block
271
//		//			org.txm.utils.logger.Log.printStackTrace(e1);
272
//		//		}
273
//		//		String [] items = planes.toArray(new String[planes.size()]);
274
//
275
//
276
//		// TODO : commented because the infos panel is not ready to manage more axes
277
//		//		if(couples != null && couples.size() > 3)	{
278
//		//			items = couples.toArray(new String[couples.size()]);
279
//		//}
280
//
281
//
282
//		plansCombo.setItems(items);
283
//
284
//		// Preselect the plan from the CA data
285
//		if(this.getIntParameterValue(CAPreferences.FIRST_DIMENSION) == 2)	{
286
//			plansCombo.select(2);
287
//		}
288
//		else if(this.getIntParameterValue(CAPreferences.SECOND_DIMENSION) == 3)	{
289
//			plansCombo.select(1);
290
//		}
291
//		else	{
292
//			plansCombo.select(0);
293
//		}
294
//
295
//		this.chartToolBar.addControl(plansCombo);
296
//
297
//		// Listeners
298
//		SelectionListener listener = new SelectionListener() {
299
//
300
//			@Override
301
//			public void widgetSelected(SelectionEvent e) {
302
//
303
//				boolean resetView = false;
304
//
305
//				// Change factors
306
//				if(e.getSource() == plansCombo)	{
307
//
308
//					Combo plans = (Combo) e.getSource();
309
//
310
//					int dimension1 = 1;
311
//					int dimension2 = 2;
312
//
313
//					String str = plans.getItem(plans.getSelectionIndex());
314
//					str = str.substring(1, str.length() -1); // remove ( and )
315
//					String[] split = str.split(","); // 2 items //$NON-NLS-1$
316
//					dimension1 = Integer.parseInt(split[0]);
317
//					dimension2 = Integer.parseInt(split[1]);
318
//
319
//					getResult().setFirstDimension(dimension1);
320
//					getResult().setSecondDimension(dimension2);
321
//
322
//					resetView = true;
323
//				}
324
//				getResult().setChartDirty();
325
//				getResult().setNeedsToResetView(resetView);
326
//				compute(true);
327
//				//forceFocus();
328
//			}
329
//
330
//			@Override
331
//			public void widgetDefaultSelected(SelectionEvent e) {
332
//				// TODO Auto-generated method stub
333
//			}
334
//		};
335
//		plansCombo.addSelectionListener(listener);
336 334

  
335
			@Override
336
			public void widgetDefaultSelected(SelectionEvent e) {
337
				// TODO Auto-generated method stub
338
			}
339
		};
340
		plansCombo.addSelectionListener(listener);
341

  
337 342
		// parent parameters
338 343
		// thresholds
339 344
		if (!this.getResult().getParent().isVisible()  // the LT parent is not visible

Formats disponibles : Unified diff