Révision 1758

tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java (revision 1758)
666 666

  
667 667
			@Override
668 668
			public void mouseMoved(final MouseEvent e) {
669
				chartEditor.getComposite().getDisplay().asyncExec(new Runnable () {
670
					public void run() {
671
						if(!chartEditor.getComposite().isDisposed())	{
669
				if(!chartEditor.getComposite().isDisposed())	{
670
					chartEditor.getComposite().getDisplay().asyncExec(new Runnable () {
671
						public void run() {
672 672
							chartEditor.getComposite().notifyListeners(SWT.MouseMove, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MouseMove));
673 673
						}
674
					}
675
				});
674
					});
675
				}
676 676
			}
677 677

  
678 678
			@Override
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/SwingChartComposite.java (revision 1758)
162 162
	
163 163
	@Override
164 164
	public boolean setFocus() {
165
		if (isDisposed()) return false;
165

  
166
		if (this.isDisposed()) {
167
			return false;
168
		}
169
		
166 170
		// Debug
167 171
		Log.finest("SwingChartComposite.setFocus(): trying to give focus to SWT composite and AWT component..."); //$NON-NLS-1$
168 172
		
tmp/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/r/RAHCChartCreator.java (revision 1758)
20 20
	@Override
21 21
	public File createChartFile(ChartResult result, File file) {
22 22

  
23
		AHC cah = (AHC) result;
23
		AHC ahc = (AHC) result;
24 24
		
25 25
		String cmd = null;
26 26
		// 2D
27
		if (result.getBooleanParameterValue(AHCPreferences.RENDERING_2D)) {
28
			cmd = "plot.HCPC(" + cah.getSymbol() + ", new.plot=FALSE, choice=\"tree\")";
27
		if (ahc.isRendering2D()) {
28
			cmd = "plot.HCPC(" + ahc.getSymbol() + ", new.plot=FALSE, choice=\"tree\")";
29 29
			
30 30
		// FIXME: for tests without drawing the inertia barplot. Without it, the max available clusters can exceed 16
31 31
		//cmd = "plot.HCPC(" + cah.getSymbol() + ", new.plot=FALSE, choice=\"tree\", tree.barplot=FALSE)"; //$NON-NLS-1$ //$NON-NLS-2$
......
36 36
		}
37 37
		// 3D
38 38
		else {
39
			cmd = "plot.HCPC("+ cah.getSymbol() +", new.plot=FALSE)";
39
			cmd = "plot.HCPC("+ ahc.getSymbol() +", new.plot=FALSE)";
40 40
		}
41 41
		
42 42
		this.getChartsEngine().plot(file, cmd);
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java (revision 1758)
1512 1512
		if (logging && inputLogger != null ) inputLogger.printMessage(expr); //$NON-NLS-1$
1513 1513
		lastSafeevalExpr = expr;
1514 1514
		
1515
		expr = "try({" + expr + "}, silent=TRUE)";
1516
		
1515 1517
		if(this.isLoggingEvalCommandLines())	{
1516
			Log.finest("Reval: " + expr, 8); //$NON-NLS-1$
1518
			// normal code
1519
			//Log.finest("RWorkspace.safeEval(): " + expr); //$NON-NLS-1$
1520
			// FIXME: SJ: for debugging purpose
1521
			Log.finest("RWorkspace.safeEval(): " + expr, 8); //$NON-NLS-1$
1517 1522
		}
1523
		
1518 1524
		REXP r = null;
1519 1525
		try {
1520
			r = connection.eval("try({" + expr + "}, silent=TRUE)");
1526
			r = connection.eval(expr);
1521 1527
		}
1522 1528
		catch (Exception e) {
1523 1529
			// TODO Auto-generated catch block

Formats disponibles : Unified diff