Révision 1715

tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java (revision 1715)
250 250
		// try to find a chart creator in other charts engines
251 251
		if(chartCreator == null)	{
252 252
			for (int i = 0; i < ChartsEngine.getChartsEngines().size(); i++) {
253
				if(ChartsEngine.getChartsEngines().get(i) == ChartsEngine.getCurrent())	{
253
				ChartsEngine chartsEngine = ChartsEngine.getChartsEngines().get(i); 
254
				if(chartsEngine == this.chartsEngine)	{
254 255
					continue;
255 256
				}
256
				chartCreator = ChartsEngine.getChartsEngines().get(i).getChartCreator(this);
257
				chartCreator = chartsEngine.getChartCreator(this);
257 258
				if(chartCreator != null)	{
258
					Log.finest("ChartResult.renderChart(): another suitable chart creator has been found in charts engine: " + ChartsEngine.getChartsEngines().get(i) + "."); //$NON-NLS-1$
259
					this.chartsEngine = ChartsEngine.getChartsEngines().get(i);
259
					Log.finest("ChartResult.renderChart(): another suitable chart creator has been found in charts engine: " + chartsEngine + "."); //$NON-NLS-1$
260
					this.chartsEngine = chartsEngine;
260 261
					break;
261 262
				}
262 263
			}
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java (revision 1715)
105 105
		HashMap<String, ChartCreator> map = this.chartCreators.get(result.getClass());
106 106
		if(map != null)	{
107 107
			chartCreator = map.get(chartType);
108
			// if chart type was null
109
//			if(chartCreator == null)	{
110
//				chartCreator = map.get(ChartsEnginePreferences.DEFAULT_CHART_TYPE);
111
//			}
112 108
		}
113 109
		
114 110
		if(chartCreator == null && showLogWarning)	{
115
			Log.fine(this.getName() + ": No chart creator can be found for result: " + result.getClass() + " and chart type: " + chartType);
111
			Log.fine(this.getName() + ": No chart creator can be found for result: " + result.getClass() + " and chart type: " + chartType + "."); //$NON-NLS-1$
116 112
		}
117 113
		return chartCreator;
118 114
	}
tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/r/RProgressionCumulativeChartCreator.java (revision 1715)
4 4

  
5 5
import org.txm.chartsengine.core.results.ChartResult;
6 6

  
7
// FIXME: SJ: this chart creator has been disabled in extension definition to force JFC mode for Cumulative chart and R mode for Density chart since the Density chart is not yet implemented in JFC charts engine  
7 8
/**
8 9
 * R progression cumulative chart creator.
9 10
 * 
tmp/org.txm.progression.core/plugin.xml (revision 1715)
8 8
            fileNamePrefix="progression_cumulative">
9 9
      </ChartCreator>
10 10
      <ChartCreator
11
            chartType="___tmp_disabled___"
11 12
            class="org.txm.progression.core.chartsengine.r.RProgressionCumulativeChartCreator"
12 13
            fileNamePrefix="progression_cumulative">
13 14
      </ChartCreator>

Formats disponibles : Unified diff